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

[Hans Goudey]

Commit: 91ecc539949b3963589db98cb657dfac491c9c71
Author: Hans Goudey
Date:   Fri Jun 4 09:22:05 2021 -0400
Branches: temp-geometry-nodes-curve-deform-node
https://developer.blender.org/rB91ecc539949b3963589db98cb657dfac491c9c71

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

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index d3f44879596,5e245d81de4..30a94704ad7
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -503,8 -503,8 +503,9 @@@ geometry_node_categories = 
      GeometryNodeCategory("GEO_CURVE", "Curve", items=[
          NodeItem("GeometryNodeCurveToMesh"),
          NodeItem("GeometryNodeCurveResample"),
 +        NodeItem("GeometryNodeCurveDeform"),
          NodeItem("GeometryNodeMeshToCurve"),
+         NodeItem("GeometryNodeCurveLength"),
      ]),
      GeometryNodeCategory("GEO_GEOMETRY", "Geometry", items=[
          NodeItem("GeometryNodeBoundBox"),
diff --cc source/blender/blenkernel/BKE_node.h
index 1ce97ceddae,380e75f0924..89d9ebdc5b3
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1431,7 -1431,7 +1431,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_MATERIAL_REPLACE 1051
  #define GEO_NODE_MESH_TO_CURVE 1052
  #define GEO_NODE_DELETE_GEOMETRY 1053
- #define GEO_NODE_CURVE_DEFORM 1054
+ #define GEO_NODE_CURVE_LENGTH 1054
++#define GEO_NODE_CURVE_DEFORM 1055
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index 828e33c256c,2a509fd7df4..8e4bf4ea92f
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5050,7 -5050,7 +5050,8 @@@ static void registerGeometryNodes(
    register_node_type_geo_boolean();
    register_node_type_geo_bounding_box();
    register_node_type_geo_collection_info();
 +  register_node_type_geo_curve_deform();
+   register_node_type_geo_curve_length();
    register_node_type_geo_curve_to_mesh();
    register_node_type_geo_curve_resample();
    register_node_type_geo_delete_geometry();
diff --cc source/blender/nodes/CMakeLists.txt
index 05b5eeffe2f,8baa891df5c..3d1ec86556c
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -162,7 -162,7 +162,8 @@@ set(SR
    geometry/nodes/node_geo_bounding_box.cc
    geometry/nodes/node_geo_collection_info.cc
    geometry/nodes/node_geo_common.cc
 +  geometry/nodes/node_geo_curve_deform.cc
+   geometry/nodes/node_geo_curve_length.cc  
    geometry/nodes/node_geo_curve_to_mesh.cc
    geometry/nodes/node_geo_curve_resample.cc
    geometry/nodes/node_geo_delete_geometry.cc
diff --cc source/blender/nodes/NOD_geometry.h
index 10118457891,3c43b53da5a..ff8e8d55d9b
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -50,7 -50,7 +50,8 @@@ void register_node_type_geo_attribute_r
  void register_node_type_geo_boolean(void);
  void register_node_type_geo_bounding_box(void);
  void register_node_type_geo_collection_info(void);
 +void register_node_type_geo_curve_deform(void);
+ void register_node_type_geo_curve_length(void);
  void register_node_type_geo_curve_to_mesh(void);
  void register_node_type_geo_curve_resample(void);
  void register_node_type_geo_delete_geometry(void);
diff --cc source/blender/nodes/NOD_static_types.h
index 2bd170dc162,19b671de49d..e6b20844400
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -289,7 -289,7 +289,8 @@@ DefNode(GeometryNode, GEO_NODE_ATTRIBUT
  DefNode(GeometryNode, GEO_NODE_BOOLEAN, def_geo_boolean, "BOOLEAN", Boolean, "Boolean", "")
  DefNode(GeometryNode, GEO_NODE_BOUNDING_BOX, 0, "BOUNDING_BOX", BoundBox, "Bounding Box", "")
  DefNode(GeometryNode, GEO_NODE_COLLECTION_INFO, def_geo_collection_info, "COLLECTION_INFO", CollectionInfo, "Collection Info", "")
 +DefNode(GeometryNode, GEO_NODE_CURVE_DEFORM, def_geo_curve_deform, "CURVE_DEFORM", CurveDeform, "Curve Deform", "")
+ DefNode(GeometryNode, GEO_NODE_CURVE_LENGTH, 0, "CURVE_LENGTH", CurveLength, "Curve Length", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_RESAMPLE, def_geo_curve_resample, "CURVE_RESAMPLE", CurveResample, "Resample Curve", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "")
  DefNode(GeometryNode, GEO_NODE_DELETE_GEOMETRY, 0, "DELETE_GEOMETRY", DeleteGeometry, "Delete Geometry", "")