diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-09-06 17:50:08 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-09-06 17:50:08 +0300 |
| commit | c3adfd6d5d21298bb7e5fa4a3be15faff71e4eec (patch) | |
| tree | 38fbf7d8ad7a962549a93d349890fad0f280f2e3 | |
| parent | edac56b4140bf2d31eea2680350166c88437508f (diff) | |
Cleanup: Rename node identifier's and file to include "Input"
| -rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 4 | ||||
| -rw-r--r-- | source/blender/nodes/NOD_static_types.h | 4 | ||||
| -rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_input_index.cc (renamed from source/blender/nodes/geometry/nodes/node_geo_index.cc) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 3f922e36b09..b2aefd63a78 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -546,8 +546,8 @@ geometry_node_categories = [ NodeItem("FunctionNodeInputVector"), NodeItem("GeometryNodeInputMaterial"), NodeItem("GeometryNodeIsViewport"), - NodeItem("GeometryNodePosition"), - NodeItem("GeometryNodeIndex"), + NodeItem("GeometryNodeInputPosition"), + NodeItem("GeometryNodeInputIndex"), NodeItem("GeometryNodeInputNormal"), ]), GeometryNodeCategory("GEO_MATERIAL", "Material", items=[ diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index e249c65368a..670cde4470e 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -314,10 +314,10 @@ DefNode(GeometryNode, GEO_NODE_CURVE_TO_POINTS, def_geo_curve_to_points, "CURVE_ DefNode(GeometryNode, GEO_NODE_CURVE_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Curve Trim", "") DefNode(GeometryNode, GEO_NODE_DELETE_GEOMETRY, 0, "DELETE_GEOMETRY", DeleteGeometry, "Delete Geometry", "") DefNode(GeometryNode, GEO_NODE_EDGE_SPLIT, 0, "EDGE_SPLIT", EdgeSplit, "Edge Split", "") -DefNode(GeometryNode, GEO_NODE_INPUT_INDEX, 0, "INDEX", Index, "Index", "") +DefNode(GeometryNode, GEO_NODE_INPUT_INDEX, 0, "INDEX", InputIndex, "Index", "") DefNode(GeometryNode, GEO_NODE_INPUT_MATERIAL, def_geo_input_material, "INPUT_MATERIAL", InputMaterial, "Material", "") DefNode(GeometryNode, GEO_NODE_INPUT_NORMAL, 0, "INPUT_NORMAL", InputNormal, "Normal", "") -DefNode(GeometryNode, GEO_NODE_INPUT_POSITION, 0, "POSITION", Position, "Position", "") +DefNode(GeometryNode, GEO_NODE_INPUT_POSITION, 0, "POSITION", InputPosition, "Position", "") DefNode(GeometryNode, GEO_NODE_IS_VIEWPORT, 0, "IS_VIEWPORT", IsViewport, "Is Viewport", "") DefNode(GeometryNode, GEO_NODE_JOIN_GEOMETRY, 0, "JOIN_GEOMETRY", JoinGeometry, "Join Geometry", "") DefNode(GeometryNode, GEO_NODE_MATERIAL_ASSIGN, 0, "MATERIAL_ASSIGN", MaterialAssign, "Material Assign", "") diff --git a/source/blender/nodes/geometry/nodes/node_geo_index.cc b/source/blender/nodes/geometry/nodes/node_geo_input_index.cc index 2cba016d54c..2cba016d54c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_index.cc |