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/editors/space_node/node_edit.c | |
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/editors/space_node/node_edit.c')
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 23855ff24e1..cd4e99900e7 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -3283,7 +3283,8 @@ static int node_mute_exec(bContext *C, wmOperator *UNUSED(op)) ED_preview_kill_jobs(C); for(node= snode->edittree->nodes.first; node; node= node->next) { - if(node->flag & SELECT) { + /* Only allow muting of nodes having a mute func! */ + if((node->flag & SELECT) && node->typeinfo->mutefunc) { /* Be able to mute in-/output nodes as well. - DingTo if(node->inputs.first && node->outputs.first) { */ node->flag ^= NODE_MUTED; |