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:
authorAntony Riakiotakis <kalast@gmail.com>2015-05-04 17:57:17 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-05-04 17:57:48 +0300
commit1227e5c3d1ee20e9af57984a261b1d51d48c0263 (patch)
treea1bcb14371874596d45b9a07f8df224b367915b0 /source/blender
parent68fe630735ea6a474e0a303f90cfb72c4e29b973 (diff)
Fix T44503 full sample does not display any preview any more.
The fix exposes another error not fixed in this commit, escaping the render will not flush the full sample render result correctly.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/image.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b714e8b7eac..5169559d80b 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3623,6 +3623,15 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
if (rpass) {
channels = rpass->channels;
rectf = rpass->rect;
+
+ if (!rectf) {
+ /* Happens when Save Buffers is enabled.
+ * Use display buffer stored in the render layer.
+ */
+ rect = (unsigned int *) rl->display_buffer;
+ byte_buffer_in_display_space = true;
+ }
+
dither = 0.0f; /* don't dither passes */
}