[Bf-blender-cvs] [1227e5c] master: Fix T44503 full sample does not display any preview any more.

[Antony Riakiotakis]

Commit: 1227e5c3d1ee20e9af57984a261b1d51d48c0263
Author: Antony Riakiotakis
Date:   Mon May 4 16:57:17 2015 +0200
Branches: master
https://developer.blender.org/rB1227e5c3d1ee20e9af57984a261b1d51d48c0263

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.

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b714e8b..5169559 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 */
 			}