diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-02-01 11:44:19 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-02-01 11:44:19 +0400 |
| commit | 386671224833baac0f3ef60d77a1caa8c0d45625 (patch) | |
| tree | 4f7a7a7ac759c1102fc8df539fe1171663870097 /source/blender/nodes | |
| parent | bcd84ec1071e01d3cfec97a1b8a043317f2f28f6 (diff) | |
Enable image and alpha outputs for image nodes by default. These were made unavailable for render layer nodes with the Combined pass disabled, but the same function also disabled them for image nodes. Fix for bug #30040.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index bb66e4bb451..52dc364e590 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -748,16 +748,16 @@ void ntreeCompositForceHidden(bNodeTree *ntree, Scene *curscene) if(rl) force_hidden_passes(node, rl->passflag); else - force_hidden_passes(node, 0); + force_hidden_passes(node, RRES_OUT_IMAGE|RRES_OUT_ALPHA); } else if(ima->type!=IMA_TYPE_MULTILAYER) { /* if ->rr not yet read we keep inputs */ - force_hidden_passes(node, RRES_OUT_Z); + force_hidden_passes(node, RRES_OUT_IMAGE|RRES_OUT_ALPHA|RRES_OUT_Z); } else - force_hidden_passes(node, 0); + force_hidden_passes(node, RRES_OUT_IMAGE|RRES_OUT_ALPHA); } else - force_hidden_passes(node, 0); + force_hidden_passes(node, RRES_OUT_IMAGE|RRES_OUT_ALPHA); } } |