[Bf-blender-cvs] [2fc1ac2eb00] builtin-simulation-nodes: cleanup
Jacques Lucke
noreply at git.blender.org
Mon Mar 2 17:23:59 CET 2020
Commit: 2fc1ac2eb00dbbcfcbd2af42a6768c5a88693ddd
Author: Jacques Lucke
Date: Mon Mar 2 16:32:44 2020 +0100
Branches: builtin-simulation-nodes
https://developer.blender.org/rB2fc1ac2eb00dbbcfcbd2af42a6768c5a88693ddd
cleanup
===================================================================
M source/blender/nodes/simulation/node_sim_util.h
M source/blender/nodes/simulation/nodes/node_sim_particle_simulation.cc
===================================================================
diff --git a/source/blender/nodes/simulation/node_sim_util.h b/source/blender/nodes/simulation/node_sim_util.h
index f6bc7bd808d..0dee312f508 100644
--- a/source/blender/nodes/simulation/node_sim_util.h
+++ b/source/blender/nodes/simulation/node_sim_util.h
@@ -13,10 +13,12 @@
#include "BLT_translation.h"
+#include "NOD_simulation.h"
+
#include "node_util.h"
void sim_node_type_base(
struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
bool sim_node_poll_default(struct bNodeType *ntype, struct bNodeTree *ntree);
-#endif /* __NODE_SHADER_UTIL_H__ */
\ No newline at end of file
+#endif /* __NODE_SHADER_UTIL_H__ */
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 6f08ac059bd..c471040cb64 100644
--- a/source/blender/nodes/simulation/nodes/node_sim_particle_simulation.cc
+++ b/source/blender/nodes/simulation/nodes/node_sim_particle_simulation.cc
@@ -1,12 +1,10 @@
-#include "NOD_simulation.h"
-
#include "node_sim_util.h"
static bNodeSocketTemplate sim_node_particle_simulation_in[] = {
- {SOCK_EMITTERS, 1, N_("Emitters"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
- {SOCK_EVENTS, 1, N_("Events"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
- {SOCK_FORCES, 1, N_("Forces"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
- {SOCK_CONTROL_FLOW, 1, N_("Control Flow"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
+ {SOCK_EMITTERS, 1, N_("Emitters")},
+ {SOCK_EVENTS, 1, N_("Events")},
+ {SOCK_FORCES, 1, N_("Forces")},
+ {SOCK_CONTROL_FLOW, 1, N_("Control Flow")},
{-1, 0, ""},
};
@@ -17,9 +15,10 @@ static bNodeSocketTemplate sim_node_particle_simulation_out[] = {
void register_node_type_sim_particle_simulation()
{
static bNodeType ntype;
+
sim_node_type_base(
&ntype, SIM_NODE_PARTICLE_SIMULATION, "Particle Simulation", NODE_CLASS_OUTPUT, 0);
node_type_socket_templates(
&ntype, sim_node_particle_simulation_in, sim_node_particle_simulation_out);
nodeRegisterType(&ntype);
-}
\ No newline at end of file
+}
More information about the Bf-blender-cvs
mailing list