diff options
author | Hans Goudey <h.goudey@me.com> | 2022-03-03 01:58:17 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-03-03 01:58:17 +0300 |
commit | 3c175caaa34f721ec876c927d9049bfdce892a69 (patch) | |
tree | 2d62510330934c6ffbde5132544b77cac700dcf3 /source | |
parent | ddf956fb5846da3835a1785978e0b9f1af89b45d (diff) |
Cleanup: Rename set handle type node internally to match UI
I've had trouble finding this node a few times now,
it's simpler if the file name matches the name in the UI.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.cc | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/NOD_geometry.h | 2 | ||||
-rw-r--r-- | source/blender/nodes/NOD_static_types.h | 2 | ||||
-rw-r--r-- | source/blender/nodes/geometry/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc (renamed from source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc) | 11 |
7 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 315e24485fa..4e664192019 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1462,7 +1462,7 @@ struct TexResult; #define GEO_NODE_SUBDIVIDE_CURVE 1097 #define GEO_NODE_INPUT_SPLINE_LENGTH 1098 #define GEO_NODE_CURVE_SPLINE_TYPE 1099 -#define GEO_NODE_CURVE_SET_HANDLES 1100 +#define GEO_NODE_CURVE_SET_HANDLE_TYPE 1100 #define GEO_NODE_POINTS_TO_VOLUME 1101 #define GEO_NODE_CURVE_HANDLE_TYPE_SELECTION 1102 #define GEO_NODE_DELETE_GEOMETRY 1103 diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 96bfcb0311b..1c0eb0ecd44 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -4750,7 +4750,7 @@ static void registerGeometryNodes() register_node_type_geo_curve_resample(); register_node_type_geo_curve_reverse(); register_node_type_geo_curve_sample(); - register_node_type_geo_curve_set_handles(); + register_node_type_geo_curve_set_handle_type(); register_node_type_geo_curve_spline_parameter(); register_node_type_geo_curve_spline_type(); register_node_type_geo_curve_subdivide(); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 387166e77b4..cc97dca9387 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -10064,7 +10064,7 @@ static void def_geo_curve_spline_type(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); } -static void def_geo_curve_set_handles(StructRNA *srna) +static void def_geo_curve_set_handle_type(StructRNA *srna) { PropertyRNA *prop; diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h index cfcc30655b5..8aea54f8ac5 100644 --- a/source/blender/nodes/NOD_geometry.h +++ b/source/blender/nodes/NOD_geometry.h @@ -74,7 +74,7 @@ void register_node_type_geo_curve_primitive_star(void); void register_node_type_geo_curve_resample(void); void register_node_type_geo_curve_reverse(void); void register_node_type_geo_curve_sample(void); -void register_node_type_geo_curve_set_handles(void); +void register_node_type_geo_curve_set_handle_type(void); void register_node_type_geo_curve_spline_parameter(void); void register_node_type_geo_curve_spline_type(void); void register_node_type_geo_curve_subdivide(void); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index efd3c420330..700c3a83b70 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -332,7 +332,7 @@ DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER, 0, "CURVE_PRIMI DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL, def_geo_curve_primitive_quadrilateral, "CURVE_PRIMITIVE_QUADRILATERAL", CurvePrimitiveQuadrilateral, "Quadrilateral", "") DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_SPIRAL, 0, "CURVE_PRIMITIVE_SPIRAL", CurveSpiral, "Curve Spiral", "") DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_STAR, 0, "CURVE_PRIMITIVE_STAR", CurveStar, "Star", "") -DefNode(GeometryNode, GEO_NODE_CURVE_SET_HANDLES, def_geo_curve_set_handles, "CURVE_SET_HANDLES", CurveSetHandles, "Set Handle Type", "") +DefNode(GeometryNode, GEO_NODE_CURVE_SET_HANDLE_TYPE, def_geo_curve_set_handle_type, "CURVE_SET_HANDLES", CurveSetHandles, "Set Handle Type", "") DefNode(GeometryNode, GEO_NODE_CURVE_SPLINE_PARAMETER, 0, "SPLINE_PARAMETER", SplineParameter, "Spline Parameter", "") DefNode(GeometryNode, GEO_NODE_CURVE_SPLINE_TYPE, def_geo_curve_spline_type, "CURVE_SPLINE_TYPE", CurveSplineType, "Set Spline Type", "") DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "") diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index 48a83dc825b..d9e64c32eae 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -90,7 +90,7 @@ set(SRC nodes/node_geo_curve_resample.cc nodes/node_geo_curve_reverse.cc nodes/node_geo_curve_sample.cc - nodes/node_geo_curve_set_handles.cc + nodes/node_geo_curve_set_handle_type.cc nodes/node_geo_curve_spline_parameter.cc nodes/node_geo_curve_spline_type.cc nodes/node_geo_curve_subdivide.cc diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc index e8da4154586..e8ba78816a5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc @@ -7,7 +7,7 @@ #include "node_geometry_util.hh" -namespace blender::nodes::node_geo_curve_set_handles_cc { +namespace blender::nodes::node_geo_curve_set_handle_type_cc { NODE_STORAGE_FUNCS(NodeGeometryCurveSetHandles) @@ -116,14 +116,15 @@ static void node_geo_exec(GeoNodeExecParams params) } params.set_output("Curve", std::move(geometry_set)); } -} // namespace blender::nodes::node_geo_curve_set_handles_cc +} // namespace blender::nodes::node_geo_curve_set_handle_type_cc -void register_node_type_geo_curve_set_handles() +void register_node_type_geo_curve_set_handle_type() { - namespace file_ns = blender::nodes::node_geo_curve_set_handles_cc; + namespace file_ns = blender::nodes::node_geo_curve_set_handle_type_cc; static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_CURVE_SET_HANDLES, "Set Handle Type", NODE_CLASS_GEOMETRY); + geo_node_type_base( + &ntype, GEO_NODE_CURVE_SET_HANDLE_TYPE, "Set Handle Type", NODE_CLASS_GEOMETRY); ntype.declare = file_ns::node_declare; ntype.geometry_node_execute = file_ns::node_geo_exec; node_type_init(&ntype, file_ns::node_init); |