[Bf-blender-cvs] [defdf63973a] builtin-simulation-nodes: remove "Input" from name

[Jacques Lucke]

Commit: defdf63973a05e4bc7b4fc02208c93f362eae6ae
Author: Jacques Lucke
Date:   Fri Mar 13 14:02:59 2020 +0100
Branches: builtin-simulation-nodes
https://developer.blender.org/rBdefdf63973a05e4bc7b4fc02208c93f362eae6ae

remove "Input" from name

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

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_simulation.h
M	source/blender/nodes/NOD_static_types.h
A	source/blender/nodes/simulation/nodes/node_sim_simulation_time.cc
D	source/blender/nodes/simulation/nodes/node_sim_simulation_time_input.cc

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

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index afbbb77ec16..3c1b0da1a0c 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -502,7 +502,7 @@ simulation_node_categories = [
         NodeItem("SimulationNodeMultiExecute"),
     ]),
     SimulationNodeCategory("FUNCTION_INPUTS", "Function Inputs", items=[
-        NodeItem("SimulationNodeSimulationTimeInput"),
+        NodeItem("SimulationNodeSimulationTime"),
     ]),
     FunctionNodeCategory("VECTOR", "Vector", items=[
         NodeItem("FunctionNodeCombineVector"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index c405d7385bb..3f7381e7bad 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1010,7 +1010,7 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree,
 #define SIM_NODE_PARTICLE_MESH_EMITTER 1007
 #define SIM_NODE_PARTICLE_MESH_COLLISION_EVENT 1008
 #define SIM_NODE_EMIT_PARTICLES 1009
-#define SIM_NODE_SIMULATION_TIME_INPUT 1010
+#define SIM_NODE_SIMULATION_TIME 1010
 
 #define FN_NODE_COMBINE_VECTOR 1100
 
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 75f1eb41d5a..8f068e3369c 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -4193,7 +4193,7 @@ static void registerSimulationNodes(void)
   register_node_type_sim_particle_mesh_emitter();
   register_node_type_sim_particle_mesh_collision_event();
   register_node_type_sim_emit_particles();
-  register_node_type_sim_simulation_time_input();
+  register_node_type_sim_simulation_time();
 }
 
 static void registerFunctionNodes(void)
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 7e80de52d3c..3c4bfdbca52 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -236,7 +236,7 @@ set(SRC
   simulation/nodes/node_sim_particle_simulation.cc
   simulation/nodes/node_sim_particle_time_step_event.cc
   simulation/nodes/node_sim_set_particle_attribute.cc
-  simulation/nodes/node_sim_simulation_time_input.cc
+  simulation/nodes/node_sim_simulation_time.cc
   simulation/node_sim_tree.cc
   simulation/node_sim_util.cc
 
diff --git a/source/blender/nodes/NOD_simulation.h b/source/blender/nodes/NOD_simulation.h
index 8c7713c85f9..bf70fb9cbbd 100644
--- a/source/blender/nodes/NOD_simulation.h
+++ b/source/blender/nodes/NOD_simulation.h
@@ -21,7 +21,7 @@ void register_node_type_sim_multi_execute(void);
 void register_node_type_sim_particle_mesh_emitter(void);
 void register_node_type_sim_particle_mesh_collision_event(void);
 void register_node_type_sim_emit_particles(void);
-void register_node_type_sim_simulation_time_input(void);
+void register_node_type_sim_simulation_time(void);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index f11db976c93..d6589e761ce 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -268,7 +268,7 @@ DefNode(SimulationNode, SIM_NODE_MULTI_EXECUTE,       0,                 "MULTI_
 DefNode(SimulationNode, SIM_NODE_PARTICLE_MESH_EMITTER,  0,              "PARTICLE_MESH_EMITTER",  ParticleMeshEmitter,  "Particle Mesh Emitter", "")
 DefNode(SimulationNode, SIM_NODE_PARTICLE_MESH_COLLISION_EVENT, 0,       "PARTICLE_MESH_COLLISION_EVENT", ParticleMeshCollisionEvent, "Particle Mesh Collision Event", "")
 DefNode(SimulationNode, SIM_NODE_EMIT_PARTICLES, 0,                      "EMIT_PARTICLES",      EmitParticles,      "Emit Particles",       "")
-DefNode(SimulationNode, SIM_NODE_SIMULATION_TIME_INPUT, 0,               "SIMULATION_TIME_INPUT",  SimulationTimeInput, "Simulation Time Input", "")
+DefNode(SimulationNode, SIM_NODE_SIMULATION_TIME, 0,                     "SIMULATION_TIME",     SimulationTime,     "Simulation Time",      "")
 
 DefNode(FunctionNode, FN_NODE_COMBINE_VECTOR, 0, "COMBINE_VECTOR", CombineVector, "Combine Vector", "")
 
diff --git a/source/blender/nodes/simulation/nodes/node_sim_simulation_time.cc b/source/blender/nodes/simulation/nodes/node_sim_simulation_time.cc
new file mode 100644
index 00000000000..6eaa7dd37de
--- /dev/null
+++ b/source/blender/nodes/simulation/nodes/node_sim_simulation_time.cc
@@ -0,0 +1,15 @@
+#include "node_sim_util.h"
+
+static bNodeSocketTemplate sim_node_simulation_time_out[] = {
+    {SOCK_FLOAT, N_("Simulation Time")},
+    {-1, ""},
+};
+
+void register_node_type_sim_simulation_time()
+{
+  static bNodeType ntype;
+
+  sim_node_type_base(&ntype, SIM_NODE_SIMULATION_TIME, "Simulation Time", 0, 0);
+  node_type_socket_templates(&ntype, nullptr, sim_node_simulation_time_out);
+  nodeRegisterType(&ntype);
+}
diff --git a/source/blender/nodes/simulation/nodes/node_sim_simulation_time_input.cc b/source/blender/nodes/simulation/nodes/node_sim_simulation_time_input.cc
deleted file mode 100644
index f9b4dd979c9..00000000000
--- a/source/blender/nodes/simulation/nodes/node_sim_simulation_time_input.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "node_sim_util.h"
-
-static bNodeSocketTemplate sim_node_simulation_time_input_out[] = {
-    {SOCK_FLOAT, N_("Simulation Time")},
-    {-1, ""},
-};
-
-void register_node_type_sim_simulation_time_input()
-{
-  static bNodeType ntype;
-
-  sim_node_type_base(&ntype, SIM_NODE_SIMULATION_TIME_INPUT, "Simulation Time Input", 0, 0);
-  node_type_socket_templates(&ntype, nullptr, sim_node_simulation_time_input_out);
-  nodeRegisterType(&ntype);
-}