[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14614] trunk/blender/source/blender/ render/intern/source/rayshade.c:

[Brecht Van Lommel]

Revision: 14614
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14614
Author:   blendix
Date:     2008-04-29 17:19:58 +0200 (Tue, 29 Apr 2008)

Log Message:
-----------

Fix for octree filling print when rendering, the counter was per object,
now counts all faces as it did before.

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

Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c	2008-04-29 13:51:47 UTC (rev 14613)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c	2008-04-29 15:19:58 UTC (rev 14614)
@@ -117,7 +117,7 @@
 	VlakRen *vlr= NULL;
 	float min[3], max[3], co1[3], co2[3], co3[3], co4[3];
 	double lasttime= PIL_check_seconds_timer();
-	int v, totface = 0;
+	int v, totv = 0, totface = 0;
 
 	INIT_MINMAX(min, max);
 
@@ -175,7 +175,7 @@
 		if(re->excludeob && obr->ob == re->excludeob)
 			continue;
 
-		for(v=0; v<obr->totvlak; v++) {
+		for(v=0; v<obr->totvlak; v++, totv++) {
 			if((v & 255)==0) {
 				double time= PIL_check_seconds_timer();
 
@@ -184,7 +184,7 @@
 					break;
 				if(time-lasttime>1.0f) {
 					char str[32];
-					sprintf(str, "Filling Octree: %d", v);
+					sprintf(str, "Filling Octree: %d", totv);
 					re->i.infostr= str;
 					re->stats_draw(&re->i);
 					re->i.infostr= NULL;