[Bf-blender-cvs] [dbeb2a77241] gsoc-2021-porting-modifiers-to-nodes-solidify: Merge remote-tracking branch 'origin/gsoc-2021-porting-modifiers-to-nodes-solidify' into gsoc-2021-porting-modifiers-to-nodes-solidify

[Fabian Schempp]

Commit: dbeb2a772410b60490adbbd97a7611b2c479ec16
Author: Fabian Schempp
Date:   Fri Jun 18 16:24:12 2021 +0200
Branches: gsoc-2021-porting-modifiers-to-nodes-solidify
https://developer.blender.org/rBdbeb2a772410b60490adbbd97a7611b2c479ec16

Merge remote-tracking branch 'origin/gsoc-2021-porting-modifiers-to-nodes-solidify' into gsoc-2021-porting-modifiers-to-nodes-solidify

# Conflicts:
#	source/blender/blenkernel/BKE_node.h
#	source/blender/blenkernel/BKE_solidifiy.h
#	source/blender/blenkernel/CMakeLists.txt
#	source/blender/blenkernel/intern/node.cc
#	source/blender/blenkernel/intern/solidify_nonmanifold.c
#	source/blender/makesrna/intern/rna_nodetree.c
#	source/blender/modifiers/intern/MOD_solidify.c
#	source/blender/nodes/CMakeLists.txt
#	source/blender/nodes/NOD_geometry.h
#	source/blender/nodes/NOD_static_types.h

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



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

diff --cc source/blender/nodes/CMakeLists.txt
index ee395f0e235,7e10846f998..75c1b25e346
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -163,12 -163,9 +163,12 @@@ set(SR
    geometry/nodes/node_geo_collection_info.cc
    geometry/nodes/node_geo_common.cc
    geometry/nodes/node_geo_convex_hull.cc
--  geometry/nodes/node_geo_curve_length.cc
++  geometry/nodes/node_geo_curve_length.cc  
    geometry/nodes/node_geo_curve_to_mesh.cc
 +  geometry/nodes/node_geo_curve_to_points.cc
    geometry/nodes/node_geo_curve_resample.cc
 +  geometry/nodes/node_geo_curve_reverse.cc
 +  geometry/nodes/node_geo_curve_subdivide.cc
    geometry/nodes/node_geo_delete_geometry.cc
    geometry/nodes/node_geo_edge_split.cc
    geometry/nodes/node_geo_input_material.cc