[Bf-blender-cvs] [5987b4cc68d] geometry-nodes-level-set-nodes: Merge branch 'master' into geometry-nodes-level-set-nodes

[Hans Goudey]

Commit: 5987b4cc68d2c4d995d37888ba3bd471d28c647b
Author: Hans Goudey
Date:   Thu Aug 5 21:14:24 2021 -0500
Branches: geometry-nodes-level-set-nodes
https://developer.blender.org/rB5987b4cc68d2c4d995d37888ba3bd471d28c647b

Merge branch 'master' into geometry-nodes-level-set-nodes

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 6dae272b2d0,caa7ab6de0a..e8d4f9e808d
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1466,9 -1475,8 +1475,11 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
  #define GEO_NODE_CURVE_TRIM 1071
  #define GEO_NODE_CURVE_SET_HANDLES 1072
- #define GEO_NODE_MESH_TO_LEVEL_SET 1073
- #define GEO_NODE_LEVEL_SET_BOOLEAN 1074
- #define GEO_NODE_LEVEL_SET_FILTER 1075
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
++#define GEO_NODE_MESH_TO_LEVEL_SET 1075
++#define GEO_NODE_LEVEL_SET_BOOLEAN 1076
++#define GEO_NODE_LEVEL_SET_FILTER 1077
  
  /** \} */