diff options
author | Jacques Lucke <jacques@blender.org> | 2020-04-20 16:27:12 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-04-20 16:27:58 +0300 |
commit | 8dbbac43bb38442e69e8dcd6a02c424ffb7855df (patch) | |
tree | aebca66b6a2b55558030a18bbdc2b50d1ce4e3cc /source/blender/blenkernel | |
parent | dcb45992bff2e4ca27a1860b9a34411f23db49a1 (diff) |
Simulations: Add Boolean Math, Switch and Float Compare node UI
Reviewers: brecht
Differential Revision: https://developer.blender.org/D7424
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 9 |
2 files changed, 19 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 38bf3d828f7..ea2a84f14f9 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1302,6 +1302,16 @@ int ntreeTexExecTree(struct bNodeTree *ntree, /** \} */ +/* -------------------------------------------------------------------- */ +/** \name Function Nodes + * \{ */ + +#define FN_NODE_BOOLEAN_MATH 1200 +#define FN_NODE_SWITCH 1201 +#define FN_NODE_FLOAT_COMPARE 1202 + +/** \} */ + void init_nodesystem(void); void free_nodesystem(void); diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 2237d061fe1..6c67ff14dac 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -67,6 +67,7 @@ #include "NOD_common.h" #include "NOD_composite.h" +#include "NOD_function.h" #include "NOD_shader.h" #include "NOD_simulation.h" #include "NOD_socket.h" @@ -4242,6 +4243,13 @@ static void registerSimulationNodes(void) register_node_type_sim_particle_attribute(); } +static void registerFunctionNodes(void) +{ + register_node_type_fn_boolean_math(); + register_node_type_fn_float_compare(); + register_node_type_fn_switch(); +} + void init_nodesystem(void) { nodetreetypes_hash = BLI_ghash_str_new("nodetreetypes_hash gh"); @@ -4266,6 +4274,7 @@ void init_nodesystem(void) registerShaderNodes(); registerTextureNodes(); registerSimulationNodes(); + registerFunctionNodes(); } void free_nodesystem(void) |