diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-27 16:17:15 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-27 16:17:15 +0300 |
commit | ae881ddf43af248ce4f5b69037dd340fa1db90b3 (patch) | |
tree | 781272db3d000b76ec538ca9b1aea6bd77eb4a60 /source/blender/makesrna/intern/rna_nodetree.c | |
parent | 2e38c07e48e80ce0da2c8454fa305941d07ed9fe (diff) |
Fix T48760: Changing Renderlayer Compositor node Layer does not update enabled outputs until script is finished
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index a5de230a9de..2f9e6741677 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -2606,6 +2606,10 @@ static void rna_Node_image_layer_update(Main *bmain, Scene *scene, PointerRNA *p BKE_image_signal(ima, iuser, IMA_SIGNAL_SRC_CHANGE); rna_Node_update(bmain, scene, ptr); + + if (scene->nodetree != NULL) { + ntreeCompositForceHidden(scene->nodetree); + } } static EnumPropertyItem *renderresult_layers_add_enum(RenderLayer *rl) @@ -2739,6 +2743,14 @@ static EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), Pointer return item; } +static void rna_Node_scene_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr) +{ + rna_Node_update(bmain, scene, ptr); + if (scene->nodetree != NULL) { + ntreeCompositForceHidden(scene->nodetree); + } +} + static EnumPropertyItem *rna_Node_channel_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { @@ -4784,7 +4796,7 @@ static void def_cmp_render_layers(StructRNA *srna) RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_scene_layer_itemf"); RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); RNA_def_property_ui_text(prop, "Layer", ""); - RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_scene_layer_update"); } static void rna_def_cmp_output_file_slot_file(BlenderRNA *brna) |