Blender Git Commit Log

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/blenloader/intern/versioning_defaults.c
# source/blender/editors/asset/intern/asset_filter.cc
# source/blender/editors/interface/interface.c
# source/blender/editors/interface/view2d_draw.c
# source/blender/freestyle/intern/winged_edge/Curvature.cpp
# source/blender/makesdna/DNA_fluid_types.h
# source/blender/python/intern/bpy_props.c
# source/blender/windowmanager/WM_types.h
# source/blender/windowmanager/intern/wm_dragdrop.c