[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28386] branches/render25/source/blender: Render Branch: Fix Full Sample not drawing render result while rendering.

[Brecht Van Lommel]

Revision: 28386
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28386
Author:   blendix
Date:     2010-04-23 17:58:39 +0200 (Fri, 23 Apr 2010)

Log Message:
-----------
Render Branch: Fix Full Sample not drawing render result while rendering.

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

Modified: branches/render25/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/image.c	2010-04-23 15:54:55 UTC (rev 28385)
+++ branches/render25/source/blender/blenkernel/intern/image.c	2010-04-23 15:58:39 UTC (rev 28386)
@@ -1874,9 +1874,6 @@
 		}
 	}
 
-	if(!(rectf || rect))
-		return NULL;
-
 	ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
 
 	/* make ibuf if needed, and initialize it */
@@ -1894,11 +1891,17 @@
 	if(rect)
 		ibuf->rect= rect;
 	
-	ibuf->rect_float= rectf;
-	ibuf->flags |= IB_rectfloat;
-	ibuf->channels= channels;
-	ibuf->zbuf_float= rectz;
-	ibuf->flags |= IB_zbuffloat;
+	if(rectf) {
+		ibuf->rect_float= rectf;
+		ibuf->flags |= IB_rectfloat;
+		ibuf->channels= channels;
+	}
+
+	if(rectz) {
+		ibuf->zbuf_float= rectz;
+		ibuf->flags |= IB_zbuffloat;
+	}
+
 	ibuf->dither= dither;
 
 	ima->ok= IMA_OK_LOADED;

Modified: branches/render25/source/blender/render/intern/source/result.c
===================================================================
--- branches/render25/source/blender/render/intern/source/result.c	2010-04-23 15:54:55 UTC (rev 28385)
+++ branches/render25/source/blender/render/intern/source/result.c	2010-04-23 15:58:39 UTC (rev 28386)
@@ -1546,7 +1546,6 @@
 			rr->rectf= re->result->rectf;
 			rr->rectz= re->result->rectz;
 			rr->rect32= re->result->rect32;
-			rr->compo_seq= (rr->rectf != NULL);
 			
 			/* active layer */
 			rl= render_get_active_layer(re, re->result);
@@ -1558,6 +1557,7 @@
 					rr->rectz= RE_RenderLayerGetPass(rl, SCE_PASS_Z);	
 			}
 
+			rr->compo_seq= (rr->rectf != NULL);
 			rr->layers= re->result->layers;
 		}
 	}