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/composite/node_composite_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/composite/node_composite_util.h')
| -rw-r--r-- | source/blender/nodes/composite/node_composite_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h index 9cac4c477eb..bb606f4202e 100644 --- a/source/blender/nodes/composite/node_composite_util.h +++ b/source/blender/nodes/composite/node_composite_util.h @@ -124,7 +124,7 @@ CompBuf *pass_on_compbuf(CompBuf *cbuf); void free_compbuf(CompBuf *cbuf); void print_compbuf(char *str, CompBuf *cbuf); void compbuf_set_node(struct CompBuf *cbuf, struct bNode *node); -void node_compo_pass_on(struct bNode *node, struct bNodeStack **nsin, struct bNodeStack **nsout); +void node_compo_pass_on(void *data, int thread, struct bNode *node, void *nodedata, struct bNodeStack **in, struct bNodeStack **out); CompBuf *get_cropped_compbuf(rcti *drect, float *rectf, int rectx, int recty, int type); CompBuf *scalefast_compbuf(CompBuf *inbuf, int newx, int newy); |