[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41910] trunk/blender/source/blender: Fix #29287: cycles and other external render engines did not print correct frame

[Brecht Van Lommel]

Revision: 41910
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41910
Author:   blendix
Date:     2011-11-16 12:47:37 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Fix #29287: cycles and other external render engines did not print correct frame
number in background render.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_internal.c
    trunk/blender/source/blender/render/intern/source/external_engine.c

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2011-11-16 12:43:12 UTC (rev 41909)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2011-11-16 12:47:37 UTC (rev 41910)
@@ -322,10 +322,13 @@
 		spos+= sprintf(spos, "%s ", rs->statstr);
 	}
 	else {
-		spos+= sprintf(spos, "Fra:%d  Ve:%d Fa:%d ", (scene->r.cfra), rs->totvert, rs->totface);
+		spos+= sprintf(spos, "Fra:%d  ", (scene->r.cfra));
+		if(rs->totvert) spos+= sprintf(spos, "Ve:%d ", rs->totvert);
+		if(rs->totface) spos+= sprintf(spos, "Fa:%d ", rs->totface);
 		if(rs->tothalo) spos+= sprintf(spos, "Ha:%d ", rs->tothalo);
 		if(rs->totstrand) spos+= sprintf(spos, "St:%d ", rs->totstrand);
-		spos+= sprintf(spos, "La:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->totlamp, megs_used_memory, mmap_used_memory, megs_peak_memory);
+		if(rs->totlamp) spos+= sprintf(spos, "La:%d ", rs->totlamp);
+		spos+= sprintf(spos, "Mem:%.2fM (%.2fM, peak %.2fM) ", megs_used_memory, mmap_used_memory, megs_peak_memory);
 
 		if(rs->curfield)
 			spos+= sprintf(spos, "Field %d ", rs->curfield);

Modified: trunk/blender/source/blender/render/intern/source/external_engine.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/external_engine.c	2011-11-16 12:43:12 UTC (rev 41909)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c	2011-11-16 12:47:37 UTC (rev 41910)
@@ -283,6 +283,11 @@
 	if(re->result==NULL)
 		return 1;
 
+	/* set render info */
+	re->i.cfra= re->scene->r.cfra;
+	BLI_strncpy(re->i.scenename, re->scene->id.name+2, sizeof(re->i.scenename));
+	re->i.totface=re->i.totvert=re->i.totstrand=re->i.totlamp=re->i.tothalo= 0;
+
 	/* render */
 	engine = RE_engine_create(type);
 	engine->re= re;