[Bf-blender-cvs] [e8738f86dc4] builtin-simulation-nodes: Rename to Combine XYZ for consistency

[Jacques Lucke]

Commit: e8738f86dc499d9e79d8dd00d188ca8c32e88b79
Author: Jacques Lucke
Date:   Fri Mar 13 14:38:57 2020 +0100
Branches: builtin-simulation-nodes
https://developer.blender.org/rBe8738f86dc499d9e79d8dd00d188ca8c32e88b79

Rename to Combine XYZ for consistency

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

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_function.h
M	source/blender/nodes/NOD_static_types.h
R052	source/blender/nodes/function/nodes/node_fn_combine_vector.cc	source/blender/nodes/function/nodes/node_fn_combine_xyz.cc

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

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 5cc0c2b2feb..604b3ac143e 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -506,7 +506,7 @@ simulation_node_categories = [
         NodeItem("SimulationNodeParticleAttribute"),
     ]),
     FunctionNodeCategory("VECTOR", "Vector", items=[
-        NodeItem("FunctionNodeCombineVector"),
+        NodeItem("FunctionNodeCombineXYZ"),
     ]),
 ]
 
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 252cd2fb0e8..d5b3077d21b 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1013,7 +1013,7 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree,
 #define SIM_NODE_SIMULATION_TIME 1010
 #define SIM_NODE_PARTICLE_ATTRIBUTE 1011
 
-#define FN_NODE_COMBINE_VECTOR 1100
+#define FN_NODE_COMBINE_XYZ 1100
 
 /* custom defines options for Material node */
 // #define SH_NODE_MAT_DIFF 1
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index c5c71583033..5095902dd4d 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -4199,7 +4199,7 @@ static void registerSimulationNodes(void)
 
 static void registerFunctionNodes(void)
 {
-  register_node_type_fn_combine_vector();
+  register_node_type_fn_combine_xyz();
 }
 
 void init_nodesystem(void)
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index a1306fa8f21..5542006b439 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -129,7 +129,7 @@ set(SRC
   composite/node_composite_tree.c
   composite/node_composite_util.c
 
-  function/nodes/node_fn_combine_vector.cc
+  function/nodes/node_fn_combine_xyz.cc
   function/node_fn_util.cc
 
   shader/nodes/node_shader_add_shader.c
diff --git a/source/blender/nodes/NOD_function.h b/source/blender/nodes/NOD_function.h
index 56e7d86180b..96e4087c489 100644
--- a/source/blender/nodes/NOD_function.h
+++ b/source/blender/nodes/NOD_function.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-void register_node_type_fn_combine_vector(void);
+void register_node_type_fn_combine_xyz(void);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index c919cc75579..db3d6d726bb 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -271,7 +271,7 @@ DefNode(SimulationNode, SIM_NODE_EMIT_PARTICLES, 0,                      "EMIT_P
 DefNode(SimulationNode, SIM_NODE_SIMULATION_TIME, 0,                     "SIMULATION_TIME",     SimulationTime,     "Simulation Time",      "")
 DefNode(SimulationNode, SIM_NODE_PARTICLE_ATTRIBUTE, 0,                  "PARTICLE_ATTRIBUTE",  ParticleAttribute,  "Particle Attribute",   "")
 
-DefNode(FunctionNode, FN_NODE_COMBINE_VECTOR, 0, "COMBINE_VECTOR", CombineVector, "Combine Vector", "")
+DefNode(FunctionNode, FN_NODE_COMBINE_XYZ, 0, "COMBINE_XYZ", CombineXYZ, "Combine XYZ", "")
 
 /* undefine macros */
 #undef DefNode
diff --git a/source/blender/nodes/function/nodes/node_fn_combine_vector.cc b/source/blender/nodes/function/nodes/node_fn_combine_xyz.cc
similarity index 52%
rename from source/blender/nodes/function/nodes/node_fn_combine_vector.cc
rename to source/blender/nodes/function/nodes/node_fn_combine_xyz.cc
index 7fc9da16461..42b7481ccf5 100644
--- a/source/blender/nodes/function/nodes/node_fn_combine_vector.cc
+++ b/source/blender/nodes/function/nodes/node_fn_combine_xyz.cc
@@ -1,22 +1,22 @@
 #include "node_fn_util.h"
 
-static bNodeSocketTemplate fn_node_combine_vector_in[] = {
+static bNodeSocketTemplate fn_node_combine_xyz_in[] = {
     {SOCK_FLOAT, N_("X"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
     {SOCK_FLOAT, N_("Y"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
     {SOCK_FLOAT, N_("Z"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
     {-1, ""},
 };
 
-static bNodeSocketTemplate fn_node_combine_vector_out[] = {
+static bNodeSocketTemplate fn_node_combine_xyz_out[] = {
     {SOCK_VECTOR, N_("Vector")},
     {-1, ""},
 };
 
-void register_node_type_fn_combine_vector()
+void register_node_type_fn_combine_xyz()
 {
   static bNodeType ntype;
 
-  fn_node_type_base(&ntype, FN_NODE_COMBINE_VECTOR, "Combine Vector", 0, 0);
-  node_type_socket_templates(&ntype, fn_node_combine_vector_in, fn_node_combine_vector_out);
+  fn_node_type_base(&ntype, FN_NODE_COMBINE_XYZ, "Combine XYZ", 0, 0);
+  node_type_socket_templates(&ntype, fn_node_combine_xyz_in, fn_node_combine_xyz_out);
   nodeRegisterType(&ntype);
 }