[Bf-blender-cvs] [4c8def9895c] soc-2021-porting-modifiers-to-nodes-decimate: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

[Fabian Schempp]

Commit: 4c8def9895ccbc43a6edf2dd7e505954116192f9
Author: Fabian Schempp
Date:   Fri Jul 30 21:02:50 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rB4c8def9895ccbc43a6edf2dd7e505954116192f9

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

===================================================================



===================================================================