[Bf-blender-cvs] [83dab8bf987] temp-geometry-nodes-curve-deform-node: Merge branch 'master' into temp-geometry-nodes-curve-deform-node

[Hans Goudey]

Commit: 83dab8bf987f860c9684391f9ea0229dfd7fa1f2
Author: Hans Goudey
Date:   Tue Jun 1 10:59:02 2021 -0400
Branches: temp-geometry-nodes-curve-deform-node
https://developer.blender.org/rB83dab8bf987f860c9684391f9ea0229dfd7fa1f2

Merge branch 'master' into temp-geometry-nodes-curve-deform-node

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 29c12b5b991,05c7ef756c7..600c6819e68
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -503,7 -503,7 +503,8 @@@ geometry_node_categories = 
      GeometryNodeCategory("GEO_CURVE", "Curve", items=[
          NodeItem("GeometryNodeCurveToMesh"),
          NodeItem("GeometryNodeCurveResample"),
 +        NodeItem("GeometryNodeCurveDeform"),
+         NodeItem("GeometryNodeMeshToCurve"),
      ]),
      GeometryNodeCategory("GEO_GEOMETRY", "Geometry", items=[
          NodeItem("GeometryNodeBoundBox"),
diff --cc source/blender/blenkernel/BKE_node.h
index e199fe507fd,fb6647cb68d..dba4769051a
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1426,7 -1429,7 +1429,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_MATERIAL_ASSIGN 1049
  #define GEO_NODE_INPUT_MATERIAL 1050
  #define GEO_NODE_MATERIAL_REPLACE 1051
- #define GEO_NODE_CURVE_DEFORM 1052
+ #define GEO_NODE_MESH_TO_CURVE 1052
++#define GEO_NODE_CURVE_DEFORM 1053
  
  /** \} */