[Bf-blender-cvs] [b8d4f81a14a] builtin-simulation-nodes: allow multiple inputs in particle simulation node

[Jacques Lucke]

Commit: b8d4f81a14a459c535e2921510df3339f788a295
Author: Jacques Lucke
Date:   Mon Mar 2 16:47:07 2020 +0100
Branches: builtin-simulation-nodes
https://developer.blender.org/rBb8d4f81a14a459c535e2921510df3339f788a295

allow multiple inputs in particle simulation node

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

M	source/blender/nodes/simulation/node_sim_tree.cc
M	source/blender/nodes/simulation/nodes/node_sim_particle_simulation.cc

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

diff --git a/source/blender/nodes/simulation/node_sim_tree.cc b/source/blender/nodes/simulation/node_sim_tree.cc
index fd56d6fd0a7..7d61b6e0903 100644
--- a/source/blender/nodes/simulation/node_sim_tree.cc
+++ b/source/blender/nodes/simulation/node_sim_tree.cc
@@ -27,4 +27,4 @@ void register_node_tree_type_sim(void)
   tt->ext.srna = &RNA_SimulationNodeTree;
 
   ntreeTypeAdd(tt);
-}
\ No newline at end of file
+}
diff --git a/source/blender/nodes/simulation/nodes/node_sim_particle_simulation.cc b/source/blender/nodes/simulation/nodes/node_sim_particle_simulation.cc
index c471040cb64..0a53c3ef4a1 100644
--- a/source/blender/nodes/simulation/nodes/node_sim_particle_simulation.cc
+++ b/source/blender/nodes/simulation/nodes/node_sim_particle_simulation.cc
@@ -1,9 +1,9 @@
 #include "node_sim_util.h"
 
 static bNodeSocketTemplate sim_node_particle_simulation_in[] = {
-    {SOCK_EMITTERS, 1, N_("Emitters")},
-    {SOCK_EVENTS, 1, N_("Events")},
-    {SOCK_FORCES, 1, N_("Forces")},
+    {SOCK_EMITTERS, 1000, N_("Emitters")},
+    {SOCK_EVENTS, 1000, N_("Events")},
+    {SOCK_FORCES, 1000, N_("Forces")},
     {SOCK_CONTROL_FLOW, 1, N_("Control Flow")},
     {-1, 0, ""},
 };