[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27600] branches/render25/source/blender/ blenkernel/intern/image.c: Render Branch: Fix render window not redrawing while rendering with FSA.

[Brecht Van Lommel]

Revision: 27600
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27600
Author:   blendix
Date:     2010-03-18 12:47:22 +0100 (Thu, 18 Mar 2010)

Log Message:
-----------
Render Branch: Fix render window not redrawing while rendering with FSA.

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/image.c

Modified: branches/render25/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/image.c	2010-03-18 11:37:43 UTC (rev 27599)
+++ branches/render25/source/blender/blenkernel/intern/image.c	2010-03-18 11:47:22 UTC (rev 27600)
@@ -1955,6 +1955,15 @@
 	
 	/* this gives active layer, composite or seqence result */
 	RE_AcquireResultImage(re, &rres);
+
+	if(!(rres.rectx > 0 && rres.recty > 0)) {
+		RE_ReleaseResultImage(re);
+		return NULL;
+	}
+
+	/* release is done in BKE_image_release_ibuf using lock_r */
+	*lock_r= re;
+
 	rect= (unsigned int *)rres.rect32;
 	rectf= rres.rectf;
 	rectz= rres.rectz;
@@ -1985,11 +1994,6 @@
 					rectz= rpass->rect;
 		}
 	}
-	
-	if(!(rectf || rect)) {
-		RE_ReleaseResultImage(re);
-		return NULL;
-	}
 
 	ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
 
@@ -1998,6 +2002,10 @@
 		ibuf= IMB_allocImBuf(rres.rectx, rres.recty, 32, 0, 0);
 		image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 	}
+
+	if(!(rectf || rect))
+		return ibuf;
+
 	ibuf->x= rres.rectx;
 	ibuf->y= rres.recty;
 	
@@ -2015,9 +2023,6 @@
 
 	ima->ok= IMA_OK_LOADED;
 
-	/* release is done in BKE_image_release_ibuf using lock_r */
-	*lock_r= re;
-
 	return ibuf;
 }