diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-24 19:41:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-24 19:41:54 +0300 |
| commit | 75f8f1907ae9f8526089f15941281e257135ecc8 (patch) | |
| tree | 2654625854e88b55e3898b888cf8383b194cb449 | |
| parent | 33bd2c15971ba50bdb15414387bd26b1ef6a8ed0 (diff) | |
Experiment with setting proper socket name for debug pass
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 1 | ||||
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index dec4a9aab13..e990ff1ec29 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 208c1f84387..21142900e20 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 } |