[Bf-blender-cvs] [49e8cfd] master: Further work to fix T38726: signal viewport to update when adding/removing render layers.
IRIE Shinsuke
noreply at git.blender.org
Wed Feb 26 18:48:56 CET 2014
Commit: 49e8cfd809fe578a20ef266469362b157620729c
Author: IRIE Shinsuke
Date: Wed Feb 26 18:35:55 2014 +0100
https://developer.blender.org/rB49e8cfd809fe578a20ef266469362b157620729c
Further work to fix T38726: signal viewport to update when adding/removing render layers.
Reviewers: brecht
Differential Revision: https://developer.blender.org/D346
===================================================================
M source/blender/editors/render/render_shading.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index 59fd7c0..c691c2c 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -541,6 +541,7 @@ static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op))
BKE_scene_add_render_layer(scene, NULL);
scene->r.actlay = BLI_countlist(&scene->r.layers) - 1;
+ DAG_id_tag_update(&scene->id, 0);
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
return OPERATOR_FINISHED;
@@ -568,6 +569,7 @@ static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op))
if (!BKE_scene_remove_render_layer(CTX_data_main(C), scene, rl))
return OPERATOR_CANCELLED;
+ DAG_id_tag_update(&scene->id, 0);
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
return OPERATOR_FINISHED;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index a98737e..3cd091c 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1056,6 +1056,7 @@ static SceneRenderLayer *rna_RenderLayer_new(ID *id, RenderData *UNUSED(rd), con
Scene *scene = (Scene *)id;
SceneRenderLayer *srl = BKE_scene_add_render_layer(scene, name);
+ DAG_id_tag_update(&scene->id, 0);
WM_main_add_notifier(NC_SCENE | ND_RENDER_OPTIONS, NULL);
return srl;
@@ -1075,6 +1076,7 @@ static void rna_RenderLayer_remove(ID *id, RenderData *UNUSED(rd), Main *bmain,
RNA_POINTER_INVALIDATE(srl_ptr);
+ DAG_id_tag_update(&scene->id, 0);
WM_main_add_notifier(NC_SCENE | ND_RENDER_OPTIONS, NULL);
}
More information about the Bf-blender-cvs
mailing list