[Bf-blender-cvs] [75f8f19] master: Experiment with setting proper socket name for debug pass

[Sergey Sharybin]

Commit: 75f8f1907ae9f8526089f15941281e257135ecc8
Author: Sergey Sharybin
Date:   Fri Jul 24 18:41:54 2015 +0200
Branches: master
https://developer.blender.org/rB75f8f1907ae9f8526089f15941281e257135ecc8

Experiment with setting proper socket name for debug pass

===================================================================

M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/nodes/composite/nodes/node_composite_image.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index dec4a9a..e990ff1 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -5883,6 +5883,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "debug_pass_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, render_pass_debug_type_items);
 	RNA_def_property_ui_text(prop, "Debug Pass Type", "Type of the debug pass to use");
+	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
 #endif
 
 	/* Nestled Data  */
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 208c1f8..2114290 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -39,6 +39,10 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 
+#ifdef WITH_CYCLES_DEBUG
+#  include "RE_pipeline.h"
+#endif
+
 /* **************** IMAGE (and RenderResult, multilayer image) ******************** */
 
 static bNodeSocketTemplate cmp_node_rlayers_out[] = {
@@ -453,7 +457,11 @@ 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
-	set_output_visible(node, passflag, RRES_OUT_DEBUG,                  SCE_PASS_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));
+	}
 #endif
 }