[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12428] trunk/blender/source/blender/ render/intern/source/pipeline.c: Stampinfo: added correct redraw after adding stamp.

[Ton Roosendaal]

Revision: 12428
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12428
Author:   ton
Date:     2007-10-29 14:11:42 +0100 (Mon, 29 Oct 2007)

Log Message:
-----------
Stampinfo: added correct redraw after adding stamp.

The issue: while renderprogress is in use, the rr->renlay has to be set

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2007-10-29 10:59:26 UTC (rev 12427)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2007-10-29 13:11:42 UTC (rev 12428)
@@ -1936,6 +1936,8 @@
 		}
 	}
 
+	/* weak... the display callback wants an active renderlayer pointer... */
+	re->result->renlay= render_get_active_layer(re, re->result);
 	re->display_draw(re->result, NULL);
 }
 
@@ -2045,11 +2047,13 @@
 	
 	re->i.lastframetime= PIL_check_seconds_timer()- re->i.starttime;
 	
+	re->stats_draw(&re->i);
+	
 	/* stamp image info here */
-	if(G.scene->r.scemode & R_STAMP_INFO && G.scene->r.stamp & R_STAMP_DRAW)
+	if((G.scene->r.scemode & R_STAMP_INFO) && (G.scene->r.stamp & R_STAMP_DRAW)) {
 		renderresult_stampinfo();
-	
-	re->stats_draw(&re->i);
+		re->display_draw(re->result, NULL);
+	}
 }
 
 static int is_rendering_allowed(Render *re)