blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

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.
This commit is contained in:
Hans Goudey 2022-03-02 17:58:17 -05:00
parent ddf956fb58
commit 3c175caaa3
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_node.h
View File

@ -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

2
source/blender/blenkernel/intern/node.cc
View File

@ -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();

2
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -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;

2
source/blender/nodes/NOD_geometry.h
View File

@ -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);

2
source/blender/nodes/NOD_static_types.h
View File

@ -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", "")

2
source/blender/nodes/geometry/CMakeLists.txt
View File

@ -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

11
source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc → source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc
View File

@ -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);