[Bf-blender-cvs] [bd1375f9cb0] temp-geometry-nodes-fields: Cleanup: Rename index node define

[Hans Goudey]

Commit: bd1375f9cb0b8ba9acbc3fde6ed3d4e9116680a2
Author: Hans Goudey
Date:   Thu Sep 2 16:20:00 2021 -0500
Branches: temp-geometry-nodes-fields
https://developer.blender.org/rBbd1375f9cb0b8ba9acbc3fde6ed3d4e9116680a2

Cleanup: Rename index node define

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

M	source/blender/blenkernel/BKE_node.h
M	source/blender/nodes/NOD_static_types.h
M	source/blender/nodes/geometry/nodes/node_geo_index.cc

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

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 8aa92ef6671..84b383491cc 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1485,7 +1485,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
 #define GEO_NODE_CURVE_FILL 1075
 #define GEO_NODE_POSITION 1076
 #define GEO_NODE_SET_POSITION 1077
-#define GEO_NODE_INDEX 1078
+#define GEO_NODE_INPUT_INDEX 1078
 
 /** \} */
 
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index 335842ecae2..1390cb97ccd 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -313,7 +313,7 @@ DefNode(GeometryNode, GEO_NODE_CURVE_TRIM, def_geo_curve_trim, "CURVE_TRIM", Cur
 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_MATERIAL, def_geo_input_material, "INPUT_MATERIAL", InputMaterial, "Material", "")
-DefNode(GeometryNode, GEO_NODE_INDEX, 0, "INDEX", Index, "Index", "")
+DefNode(GeometryNode, GEO_NODE_INPUT_INDEX, 0, "INDEX", Index, "Index", "")
 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_index.cc
index 037c3c92191..d20d7a4b1e9 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_index.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_index.cc
@@ -18,7 +18,7 @@
 
 namespace blender::nodes {
 
-static void geo_node_index_declare(NodeDeclarationBuilder &b)
+static void GEO_NODE_INPUT_INDEX_declare(NodeDeclarationBuilder &b)
 {
   b.add_output<decl::Int>("Index");
 }
@@ -41,7 +41,7 @@ class IndexContextFieldSource final : public fn::ContextFieldSource {
   }
 };
 
-static void geo_node_index_exec(GeoNodeExecParams params)
+static void GEO_NODE_INPUT_INDEX_exec(GeoNodeExecParams params)
 {
   Field<int> index_field{std::make_shared<IndexContextFieldSource>()};
   params.set_output("Index", std::move(index_field));
@@ -53,8 +53,8 @@ void register_node_type_geo_index()
 {
   static bNodeType ntype;
 
-  geo_node_type_base(&ntype, GEO_NODE_INDEX, "Index", NODE_CLASS_INPUT, 0);
-  ntype.geometry_node_execute = blender::nodes::geo_node_index_exec;
-  ntype.declare = blender::nodes::geo_node_index_declare;
+  geo_node_type_base(&ntype, GEO_NODE_INPUT_INDEX, "Index", NODE_CLASS_INPUT, 0);
+  ntype.geometry_node_execute = blender::nodes::GEO_NODE_INPUT_INDEX_exec;
+  ntype.declare = blender::nodes::GEO_NODE_INPUT_INDEX_declare;
   nodeRegisterType(&ntype);
 }