[Bf-blender-cvs] [4a80c4f] master: Multi-View: Code cleanup

[Dalai Felinto]

Commit: 4a80c4faded742aeebc2852f23e210163a5759dc
Author: Dalai Felinto
Date:   Mon Apr 27 12:09:04 2015 -0300
Branches: master
https://developer.blender.org/rB4a80c4faded742aeebc2852f23e210163a5759dc

Multi-View: Code cleanup

I finally put the time into understanding what was going on here.
Basically RE_AcquireResultImage() produces RenderResults without
RenderViews. That will be fine for now since I'm planning to refactor
RenderResult soon.

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

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

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index d76537a..162f453 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3569,26 +3569,26 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
 	if (from_render) {
 		BLI_lock_thread(LOCK_VIEWER);
 		*lock_r = re;
+		rv = NULL;
+	}
+	else {
+		rv = BLI_findlink(&rres.views, actview);
+		if (rv == NULL)
+			rv = rres.views.first;
 	}
 
-	rv = BLI_findlink(&rres.views, actview);
-	if (rv == NULL)
-		rv = rres.views.first;
-
-	if (rv != NULL) {
-		/* this gives active layer, composite or sequence result */
+	/* this gives active layer, composite or sequence result */
+	if (rv == NULL) {
+		rect = (unsigned int *)rres.rect32;
+		rectf = rres.rectf;
+		rectz = rres.rectz;
+	}
+	else {
 		rect = (unsigned int *)rv->rect32;
 		rectf = rv->rectf;
 		rectz = rv->rectz;
 	}
-	else {
-		/* XXX This should never happen, yet it does - T44498, T44514
-	     * I'm waiting to investigate more, but meanwhile this fix
-	     * the immediate issue */
-		rect = NULL;
-		rectf = NULL;
-		rectz = NULL;
-	}
+
 	dither = iuser->scene->r.dither_intensity;
 
 	/* combined layer gets added as first layer */