From ecedef09e7fde9c032b746137211f02acfb6160a Mon Sep 17 00:00:00 2001 From: Johnny Matthews Date: Mon, 11 Oct 2021 10:38:45 -0500 Subject: Geometry Nodes: Rename 12 Nodes to be "Verb First" Attribute Capture => Capture Attribute Curve Fill => Fill Curve Curve Fillet => Fillet Curve Curve Reverse => Reverse Curve Curve Sample => Sample Curve Curve Subdivide => Subdivide Curve Curve Trim => Trim Curve Material Assign => Assign Material Material Replace => Replace Material Mesh Subdivide => Subdivide Mesh Float Compare => Compare Float Boolean => Mesh Boolean Differential Revision: https://developer.blender.org/D12798 Task: https://developer.blender.org/T91682 --- source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_boolean.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_material_assign.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_material_replace.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/nodes/geometry') diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc index 43fb00a482c..8cb7d81f432 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc @@ -194,7 +194,7 @@ void register_node_type_geo_attribute_capture() static bNodeType ntype; geo_node_type_base( - &ntype, GEO_NODE_ATTRIBUTE_CAPTURE, "Attribute Capture", NODE_CLASS_ATTRIBUTE, 0); + &ntype, GEO_NODE_ATTRIBUTE_CAPTURE, "Capture Attribute", NODE_CLASS_ATTRIBUTE, 0); node_type_storage(&ntype, "NodeGeometryAttributeCapture", node_free_standard_storage, diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc index 21b425c0ed4..ee72d27a87b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc @@ -128,7 +128,7 @@ void register_node_type_geo_boolean() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_BOOLEAN, "Boolean", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_BOOLEAN, "Mesh Boolean", NODE_CLASS_GEOMETRY, 0); ntype.declare = blender::nodes::geo_node_boolean_declare; ntype.draw_buttons = blender::nodes::geo_node_boolean_layout; ntype.updatefunc = blender::nodes::geo_node_boolean_update; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc index c30741cf786..0c1fe1fa6a2 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc @@ -166,7 +166,7 @@ void register_node_type_geo_curve_fill() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_CURVE_FILL, "Curve Fill", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_CURVE_FILL, "Fill Curve", NODE_CLASS_GEOMETRY, 0); node_type_init(&ntype, blender::nodes::geo_node_curve_fill_init); node_type_storage( diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc index 78ab4119c8b..bdf122aff29 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc @@ -635,7 +635,7 @@ void register_node_type_geo_curve_fillet() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_CURVE_FILLET, "Curve Fillet", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_CURVE_FILLET, "Fillet Curve", NODE_CLASS_GEOMETRY, 0); ntype.draw_buttons = blender::nodes::geo_node_curve_fillet_layout; node_type_storage( &ntype, "NodeGeometryCurveFillet", node_free_standard_storage, node_copy_standard_storage); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc index b644faabedb..adeaa67e1b6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc @@ -65,7 +65,7 @@ static void geo_node_curve_reverse_exec(GeoNodeExecParams params) void register_node_type_geo_curve_reverse() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_CURVE_REVERSE, "Curve Reverse", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_CURVE_REVERSE, "Reverse Curve", NODE_CLASS_GEOMETRY, 0); ntype.declare = blender::nodes::geo_node_curve_reverse_declare; ntype.geometry_node_execute = blender::nodes::geo_node_curve_reverse_exec; nodeRegisterType(&ntype); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc index 1266f525861..e4043d9408c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc @@ -275,7 +275,7 @@ void register_node_type_geo_curve_sample() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_CURVE_SAMPLE, "Curve Sample", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_CURVE_SAMPLE, " Sample Curve", NODE_CLASS_GEOMETRY, 0); ntype.geometry_node_execute = blender::nodes::geo_node_curve_sample_exec; ntype.declare = blender::nodes::geo_node_curve_sample_declare; node_type_init(&ntype, blender::nodes::geo_node_curve_sample_type_init); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc index 34997c66cbb..99379ab7259 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc @@ -357,7 +357,7 @@ void register_node_type_geo_curve_subdivide() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_CURVE_SUBDIVIDE, "Curve Subdivide", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_CURVE_SUBDIVIDE, "Subdivide Curve", NODE_CLASS_GEOMETRY, 0); ntype.declare = blender::nodes::geo_node_curve_subdivide_declare; ntype.geometry_node_execute = blender::nodes::geo_node_subdivide_exec; nodeRegisterType(&ntype); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc index 4303999f79c..fd340afabbb 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc @@ -424,7 +424,7 @@ static void geo_node_curve_trim_exec(GeoNodeExecParams params) void register_node_type_geo_curve_trim() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_CURVE_TRIM, "Curve Trim", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_CURVE_TRIM, "Trim Curve", NODE_CLASS_GEOMETRY, 0); ntype.geometry_node_execute = blender::nodes::geo_node_curve_trim_exec; ntype.draw_buttons = blender::nodes::geo_node_curve_trim_layout; ntype.declare = blender::nodes::geo_node_curve_trim_declare; diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc b/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc index 780994996ae..26c1aabf39f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc @@ -90,7 +90,7 @@ void register_node_type_geo_material_assign() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_MATERIAL_ASSIGN, "Material Assign", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_MATERIAL_ASSIGN, "Assign Material", NODE_CLASS_GEOMETRY, 0); ntype.declare = blender::nodes::geo_node_material_assign_declare; ntype.geometry_node_execute = blender::nodes::geo_node_material_assign_exec; nodeRegisterType(&ntype); diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc index a917434fa00..e2a9510c3cb 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc @@ -62,7 +62,7 @@ void register_node_type_geo_material_replace() static bNodeType ntype; geo_node_type_base( - &ntype, GEO_NODE_MATERIAL_REPLACE, "Material Replace", NODE_CLASS_GEOMETRY, 0); + &ntype, GEO_NODE_MATERIAL_REPLACE, "Replace Material", NODE_CLASS_GEOMETRY, 0); ntype.declare = blender::nodes::geo_node_material_replace_declare; ntype.geometry_node_execute = blender::nodes::geo_node_material_replace_exec; nodeRegisterType(&ntype); diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc index c436f5bd480..79324b38241 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc @@ -103,7 +103,7 @@ void register_node_type_geo_mesh_subdivide() { static bNodeType ntype; - geo_node_type_base(&ntype, GEO_NODE_MESH_SUBDIVIDE, "Mesh Subdivide", NODE_CLASS_GEOMETRY, 0); + geo_node_type_base(&ntype, GEO_NODE_MESH_SUBDIVIDE, "Subdivide Mesh", NODE_CLASS_GEOMETRY, 0); ntype.declare = blender::nodes::geo_node_mesh_subdivide_declare; ntype.geometry_node_execute = blender::nodes::geo_node_mesh_subdivide_exec; nodeRegisterType(&ntype); -- cgit v1.2.3