Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-04-29 19:19:58 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-04-29 19:19:58 +0400
commit17d83bfefbf4376916c7acdc58262fb6b37ac636 (patch)
tree5f2ab70abd193ca2dbf799e254f75f4054a097f4 /source/blender/render/intern
parentd5bfb1b6d937626ef6525a67c591f1f61b3aaa52 (diff)
Fix for octree filling print when rendering, the counter was per object,
now counts all faces as it did before.
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r--source/blender/render/intern/source/rayshade.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 7ffed72329e..6aee1d2a883 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -117,7 +117,7 @@ void makeraytree(Render *re)
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 @@ void makeraytree(Render *re)
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 @@ void makeraytree(Render *re)
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;