From 5acce60d376292bc228211075c9fe05b41c84ccd Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 24 Jul 2015 23:05:11 +0200 Subject: 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. --- source/blender/nodes/composite/nodes/node_composite_image.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source/blender/nodes') 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 } -- cgit v1.2.3