diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-25 00:05:11 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-25 00:05:11 +0300 |
| commit | 5acce60d376292bc228211075c9fe05b41c84ccd (patch) | |
| tree | 96312421a81e20448f22fb5e3640cdaf50a8ec7a /source/blender/nodes | |
| parent | 7c5c7b5ef6c3a77411b9e197152d5754943a034d (diff) | |
Compositor: Fixes for the debug pass
This commit fixes issues with wrong socket type being added to the Cycles debug
pass compositor operation, which lead to crashes with non-value pass types.
This commit also reverts socket renaming thing because while it's was behaving
ok on runtime file reload might have loose the links which is annoying.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 21142900e20..4f02c106569 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -457,11 +457,7 @@ void node_cmp_rlayers_force_hidden_passes(bNode *node) set_output_visible(node, passflag, RRES_OUT_SUBSURFACE_COLOR, SCE_PASS_SUBSURFACE_COLOR); #ifdef WITH_CYCLES_DEBUG - { - bNodeSocket *sock = BLI_findlink(&node->outputs, RRES_OUT_DEBUG); - set_output_visible(node, passflag, RRES_OUT_DEBUG, SCE_PASS_DEBUG); - strcpy(sock->name, RE_debug_pass_name_get(scene->r.debug_pass_type)); - } + set_output_visible(node, passflag, RRES_OUT_DEBUG, SCE_PASS_DEBUG); #endif } |