diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-11-30 02:51:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-11-30 02:54:45 +0300 |
| commit | 5b90a6e188f78ee4544b528c55fb0f2a8f6e9fd6 (patch) | |
| tree | b48605900800fdcfd036d192b5c45b3a790624a9 /source/blender/editors/render | |
| parent | f448659a56210a093570bafa868a3a19761e67df (diff) | |
Fix T38245: render slot getting lost when switching slots while compositing.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index f44374b1d7b..a7038ac53cc 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -311,7 +311,7 @@ static int screen_render_exec(bContext *C, wmOperator *op) ima = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"); BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE); - BKE_image_backup_render(scene, ima); + BKE_image_backup_render(scene, ima, true); /* cleanup sequencer caches before starting user triggered render. * otherwise, invalidated cache entries can make their way into @@ -956,7 +956,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even /* get a render result image, and make sure it is empty */ ima = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"); BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE); - BKE_image_backup_render(rj->scene, ima); + BKE_image_backup_render(rj->scene, ima, true); rj->image = ima; /* setup new render */ diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 2e9ccc520d9..f94f3cdf758 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -559,7 +559,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) /* create image and image user */ oglrender->ima = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"); BKE_image_signal(oglrender->ima, NULL, IMA_SIGNAL_FREE); - BKE_image_backup_render(oglrender->scene, oglrender->ima); + BKE_image_backup_render(oglrender->scene, oglrender->ima, true); oglrender->iuser.scene = scene; oglrender->iuser.ok = 1; |