[Bf-blender-cvs] [6b44605cec1] geometry-nodes-curve-support: Merge branch 'master' into geometry-nodes-curve-support

[Hans Goudey]

Commit: 6b44605cec1d0fe195ffcd97317a0ff4f949a05b
Author: Hans Goudey
Date:   Mon Apr 19 16:57:02 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rB6b44605cec1d0fe195ffcd97317a0ff4f949a05b

Merge branch 'master' into geometry-nodes-curve-support

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 1959f016811,2a33c4819e3..a36e25956b4
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1413,10 -1413,7 +1413,11 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_ATTRIBUTE_MAP_RANGE 1040
  #define GEO_NODE_ATTRIBUTE_CLAMP 1041
  #define GEO_NODE_BOUNDING_BOX 1042
- #define GEO_NODE_CURVE_TO_MESH 1043
- #define GEO_NODE_CURVE_TRANSFORM_TEST 1044
- #define GEO_NODE_CURVE_TRIM 1045
- #define GEO_NODE_CURVE_SAMPLE_POINTS 1046
+ #define GEO_NODE_SWITCH 1043
++#define GEO_NODE_CURVE_TO_MESH 1044
++#define GEO_NODE_CURVE_TRANSFORM_TEST 1045
++#define GEO_NODE_CURVE_TRIM 1046
++#define GEO_NODE_CURVE_SAMPLE_POINTS 1047
  
  /** \} */
  
diff --cc source/blender/nodes/NOD_static_types.h
index 3617ffd5293,12e14768c35..0b3b5c4b05b
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -310,10 -310,7 +310,11 @@@ DefNode(GeometryNode, GEO_NODE_MESH_PRI
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_MAP_RANGE, def_geo_attribute_map_range, "ATTRIBUTE_MAP_RANGE", AttributeMapRange, "Attribute Map Range", "")
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_CLAMP, def_geo_attribute_clamp, "ATTRIBUTE_CLAMP", AttributeClamp, "Attribute Clamp", "")
  DefNode(GeometryNode, GEO_NODE_BOUNDING_BOX, 0, "BOUNDING_BOX", BoundBox, "Bounding Box", "")
+ DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "")
 +DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "")
 +DefNode(GeometryNode, GEO_NODE_CURVE_TRANSFORM_TEST, 0, "TRANSFORM_TEST", TransformTest, "Transform Test", "")
 +DefNode(GeometryNode, GEO_NODE_CURVE_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Curve Trim", "")
 +DefNode(GeometryNode, GEO_NODE_CURVE_SAMPLE_POINTS, def_geo_curve_sample_points, "CURVE_SAMPLE_POINTS", CurveSamplePoints, "Curve Sample Points", "")
  
  /* undefine macros */
  #undef DefNode