[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30079] trunk/blender/source/blender: Fix #22354, #22727, #22501: image window not display correct

[Brecht Van Lommel]

Revision: 30079
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30079
Author:   blendix
Date:     2010-07-07 16:28:22 +0200 (Wed, 07 Jul 2010)

Log Message:
-----------
Fix #22354, #22727, #22501: image window not display correct
renders with compositing and slots.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/render/extern/include/RE_pipeline.h
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2010-07-07 14:10:41 UTC (rev 30078)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2010-07-07 14:28:22 UTC (rev 30079)
@@ -1827,10 +1827,13 @@
 	layer= (iuser)? iuser->layer: 0;
 	pass= (iuser)? iuser->pass: 0;
 
-	if(from_render)
+	if(from_render) {
 		RE_AcquireResultImage(re, &rres);
-	else if(ima->renders[ima->render_slot])
+	}
+	else if(ima->renders[ima->render_slot]) {
 		rres= *(ima->renders[ima->render_slot]);
+		rres.have_combined= rres.rectf != NULL;
+	}
 	else
 		memset(&rres, 0, sizeof(RenderResult));
 	
@@ -1852,10 +1855,10 @@
 	rectz= rres.rectz;
 	dither= iuser->scene->r.dither_intensity;
 
-	/* get compo/seq result by default */
-	if(rres.compo_seq && layer==0);
+	/* combined layer gets added as first layer */
+	if(rres.have_combined && layer==0);
 	else if(rres.layers.first) {
-		RenderLayer *rl= BLI_findlink(&rres.layers, layer-(rres.compo_seq?1:0));
+		RenderLayer *rl= BLI_findlink(&rres.layers, layer-(rres.have_combined?1:0));
 		if(rl) {
 			RenderPass *rpass;
 

Modified: trunk/blender/source/blender/render/extern/include/RE_pipeline.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_pipeline.h	2010-07-07 14:10:41 UTC (rev 30078)
+++ trunk/blender/source/blender/render/extern/include/RE_pipeline.h	2010-07-07 14:28:22 UTC (rev 30079)
@@ -130,8 +130,8 @@
 	/* for render results in Image, verify validity for sequences */
 	int framenr;
 
-	/* for acquire image, to indicate if it is compo/seq result */
-	int compo_seq;
+	/* for acquire image, to indicate if it there is a combined layer */
+	int have_combined;
 
 	/* render info text */
 	char *text;

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-07-07 14:10:41 UTC (rev 30078)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-07-07 14:28:22 UTC (rev 30079)
@@ -1085,7 +1085,7 @@
 					rr->rectz= RE_RenderLayerGetPass(rl, SCE_PASS_Z);	
 			}
 
-			rr->compo_seq= (rr->rectf != NULL);
+			rr->have_combined= (re->result->rectf != NULL);
 			rr->layers= re->result->layers;
 		}
 	}