[Bf-blender-cvs] [98313622431] geometry-nodes: Geometry Nodes: rename Join to Join Geometry

[Jacques Lucke]

Commit: 983136224316b34f01d2aa449ba26c35e4324de3
Author: Jacques Lucke
Date:   Tue Nov 24 14:21:54 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rB983136224316b34f01d2aa449ba26c35e4324de3

Geometry Nodes: rename Join to Join Geometry

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

M	release/scripts/startup/nodeitems_builtins.py
M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/intern/node.c
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/NOD_geometry.h
M	source/blender/nodes/NOD_static_types.h
R094	source/blender/nodes/geometry/nodes/node_geo_join.cc	source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc

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

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 9791b0dbdd5..b1789776728 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -497,7 +497,7 @@ geometry_node_categories = [
     GeometryNodeCategory("GEO_GEOMETRY", "Geometry", items=[
         NodeItem("GeometryNodeTransform"),
         NodeItem("GeometryNodeBoolean"),
-        NodeItem("GeometryNodeJoin"),
+        NodeItem("GeometryNodeJoinGeometry"),
     ]),
     GeometryNodeCategory("GEO_INPUT", "Input", items=[
         NodeItem("GeometryNodeObjectInfo"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 23893d3d6b6..905316a937d 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1347,7 +1347,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
 #define GEO_NODE_OBJECT_INFO 1007
 #define GEO_NODE_RANDOM_ATTRIBUTE 1008
 #define GEO_NODE_ATTRIBUTE_MATH 1009
-#define GEO_NODE_JOIN 1010
+#define GEO_NODE_JOIN_GEOMETRY 1010
 
 /** \} */
 
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index a5df5df7f77..b564a4c468b 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -4692,7 +4692,7 @@ static void registerGeometryNodes(void)
   register_node_type_geo_object_info();
   register_node_type_geo_random_attribute();
   register_node_type_geo_attribute_math();
-  register_node_type_geo_join();
+  register_node_type_geo_join_geometry();
 }
 
 static void registerFunctionNodes(void)
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index cb95b09135f..7115c20cf97 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -142,7 +142,7 @@ set(SRC
   geometry/nodes/node_geo_common.cc
   geometry/nodes/node_geo_boolean.cc
   geometry/nodes/node_geo_edge_split.cc
-  geometry/nodes/node_geo_join.cc
+  geometry/nodes/node_geo_join_geometry.cc
   geometry/nodes/node_geo_object_info.cc
   geometry/nodes/node_geo_subdivision_surface.cc
   geometry/nodes/node_geo_point_distribute.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 122b9a7cd17..0532547375f 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -36,7 +36,7 @@ void register_node_type_geo_point_instance(void);
 void register_node_type_geo_object_info(void);
 void register_node_type_geo_random_attribute(void);
 void register_node_type_geo_attribute_math(void);
-void register_node_type_geo_join(void);
+void register_node_type_geo_join_geometry(void);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index 49a761a45b5..09e0908140c 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -276,7 +276,7 @@ DefNode(GeometryNode, GEO_NODE_POINT_INSTANCE, 0, "POINT_INSTANCE", PointInstanc
 DefNode(GeometryNode, GEO_NODE_OBJECT_INFO, 0, "OBJECT_INFO", ObjectInfo, "Object Info", "")
 DefNode(GeometryNode, GEO_NODE_RANDOM_ATTRIBUTE, def_geo_random_attribute, "RANDOM_ATTRIBUTE", RandomAttribute, "Random Attribute", "")
 DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_MATH, def_geo_attribute_math, "ATTRIBUTE_MATH", AttributeMath, "Attribute Math", "")
-DefNode(GeometryNode, GEO_NODE_JOIN, 0, "JOIN", Join, "Join", "")
+DefNode(GeometryNode, GEO_NODE_JOIN_GEOMETRY, 0, "JOIN_GEOMETRY", JoinGeometry, "Join Geometry", "")
 
 /* undefine macros */
 #undef DefNode
diff --git a/source/blender/nodes/geometry/nodes/node_geo_join.cc b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
similarity index 94%
rename from source/blender/nodes/geometry/nodes/node_geo_join.cc
rename to source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
index f402ed4542a..1dd448004c0 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_join.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
@@ -23,13 +23,13 @@
 
 #include "node_geometry_util.hh"
 
-static bNodeSocketTemplate geo_node_join_in[] = {
+static bNodeSocketTemplate geo_node_join_geometry_in[] = {
     {SOCK_GEOMETRY, N_("Geometry")},
     {SOCK_GEOMETRY, N_("Geometry")},
     {-1, ""},
 };
 
-static bNodeSocketTemplate geo_node_join_out[] = {
+static bNodeSocketTemplate geo_node_join_geometry_out[] = {
     {SOCK_GEOMETRY, N_("Geometry")},
     {-1, ""},
 };
@@ -239,7 +239,7 @@ static void join_component_type(Span<const GeometrySet *> src_geometry_sets, Geo
   join_components(components, result);
 }
 
-static void geo_node_join_exec(GeoNodeExecParams params)
+static void geo_node_join_geometry_exec(GeoNodeExecParams params)
 {
   GeometrySet geometry_set_a = params.extract_input<GeometrySet>("Geometry");
   GeometrySet geometry_set_b = params.extract_input<GeometrySet>("Geometry_001");
@@ -255,12 +255,12 @@ static void geo_node_join_exec(GeoNodeExecParams params)
 }
 }  // namespace blender::nodes
 
-void register_node_type_geo_join()
+void register_node_type_geo_join_geometry()
 {
   static bNodeType ntype;
 
-  geo_node_type_base(&ntype, GEO_NODE_JOIN, "Join", 0, 0);
-  node_type_socket_templates(&ntype, geo_node_join_in, geo_node_join_out);
-  ntype.geometry_node_execute = blender::nodes::geo_node_join_exec;
+  geo_node_type_base(&ntype, GEO_NODE_JOIN_GEOMETRY, "Join Geometry", 0, 0);
+  node_type_socket_templates(&ntype, geo_node_join_geometry_in, geo_node_join_geometry_out);
+  ntype.geometry_node_execute = blender::nodes::geo_node_join_geometry_exec;
   nodeRegisterType(&ntype);
 }