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/shader/node_shader_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/shader/node_shader_util.h')
| -rw-r--r-- | source/blender/nodes/shader/node_shader_util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index 48e54d9d0b4..d345f3fb310 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -128,4 +128,7 @@ void node_shader_gpu_tex_mapping(struct GPUMaterial *mat, struct bNode *node, st void ntreeExecGPUNodes(struct bNodeTreeExec *exec, struct GPUMaterial *mat, int do_outputs); +void node_shader_pass_on(void *data, int thread, struct bNode *node, void *nodedata, struct bNodeStack **in, struct bNodeStack **out); +int gpu_shader_pass_on(struct GPUMaterial *mat, struct bNode *node, void *nodedata, struct GPUNodeStack *in, struct GPUNodeStack *out); + #endif |