Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-02-26 17:36:30 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-02-26 17:39:14 +0400
commitecbae4ab466e9d50b11fd434caf29ea1781fa7d6 (patch)
treeff84915157ace0ebcfa57d1d9755078ff8455586 /source/blender/editors/render
parentef2c05c77e365a07f8ced62e37c9430114b990d8 (diff)
Fix T38846: Render layer checkbox is not refreshed.
The render operator invoke checks render layers, which can force the render layer to be activated. This requires a notifier, which has to be done in the operator itself (can't do this inside pipeline code).
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_internal.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index e57474a0443..c922389f3cc 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -799,14 +799,17 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
const char *name;
ScrArea *sa;
+ bool scene_rlayer_update;
/* only one render job at a time */
if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER))
return OPERATOR_CANCELLED;
- if (!RE_is_rendering_allowed(scene, camera_override, op->reports)) {
+ if (!RE_is_rendering_allowed(scene, camera_override, op->reports, &scene_rlayer_update)) {
return OPERATOR_CANCELLED;
}
+ if (scene_rlayer_update)
+ WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, NULL);
if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected");