diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-11-20 20:38:23 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-11-20 20:38:23 +0400 |
commit | 6673c76e78742c64ccd0afa7a9d1f598a8022878 (patch) | |
tree | 5304bf79c57391c4dcc561746e770e006ba45e18 /source/blender/nodes/intern/node_util.h | |
parent | bbf8315313a9e221ba398bbe06e342bd949c973b (diff) |
Muting node patch: second part. Also fix [#27636] Muting shading nodes is ignored
Now, compositing, shading and texture nodes have a consistent muting system, with default behaving as previous (for compo), and which can be optionaly customized by each node.
Shader nodes are also GLSL muted.
However, Cycles is currently unaware of muted nodes, will try to address this…
Diffstat (limited to 'source/blender/nodes/intern/node_util.h')
-rw-r--r-- | source/blender/nodes/intern/node_util.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h index d127a49cb4b..7ca090394c3 100644 --- a/source/blender/nodes/intern/node_util.h +++ b/source/blender/nodes/intern/node_util.h @@ -41,6 +41,8 @@ #include "NOD_socket.h" +#include "GPU_material.h" /* For Shader muting GPU code... */ + struct bNodeTree; struct bNode; @@ -59,6 +61,15 @@ const char *node_math_label(struct bNode *node); const char *node_vect_math_label(struct bNode *node); const char *node_filter_label(struct bNode *node); +typedef struct LinkInOutsMuteNode +{ + struct LinkInOutsMuteNode *next, *prev; + void *in, *outs; + unsigned int num_outs; /* If > 1, outs is an array of pointers that need to be freed too! */ +} LinkInOutsMuteNode; +ListBase node_mute_get_links(struct bNodeTree *ntree, struct bNode *node, struct bNodeStack **nsin, + struct bNodeStack **nsout, struct GPUNodeStack *gnsin, struct GPUNodeStack *gnsout); + #endif // this is needed for inlining behaviour |