diff options
Diffstat (limited to 'source/blender/render')
4 files changed, 5 insertions, 18 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 089c7eb044b..4dd2b300700 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -159,7 +159,6 @@ typedef struct RenderResult { typedef struct RenderStats { int cfra; - int totface, totvert, totlamp, totpart; bool localview; double starttime, lastframetime; const char *infostr, *statstr; diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 440c54f5eeb..b2121816932 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -674,7 +674,6 @@ bool RE_bake_engine(Render *re, /* set render info */ re->i.cfra = re->scene->r.cfra; BLI_strncpy(re->i.scene_name, re->scene->id.name + 2, sizeof(re->i.scene_name) - 2); - re->i.totface = re->i.totvert = re->i.totlamp = 0; /* render */ engine = re->engine; @@ -812,7 +811,6 @@ int RE_engine_render(Render *re, int do_all) /* set render info */ re->i.cfra = re->scene->r.cfra; BLI_strncpy(re->i.scene_name, re->scene->id.name + 2, sizeof(re->i.scene_name)); - re->i.totface = re->i.totvert = re->i.totlamp = 0; /* render */ engine = re->engine; diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index d1632dfeacd..7eeef79e527 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -268,9 +268,6 @@ void RE_parts_init(Render *re) re->parts = BLI_ghash_new( BLI_ghashutil_inthash_v4_p, BLI_ghashutil_inthash_v4_cmp, "render parts"); - /* this is render info for caller, is not reset when parts are freed! */ - re->i.totpart = 0; - /* just for readable code.. */ xminb = re->disprect.xmin; yminb = re->disprect.ymin; @@ -328,7 +325,6 @@ void RE_parts_init(Render *re) pa->recty = recty; BLI_ghash_insert(re->parts, &pa->disprect, pa); - re->i.totpart++; } } } diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 917193553dc..14375c27bfa 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -188,6 +188,10 @@ static int default_break(void *UNUSED(arg)) static void stats_background(void *UNUSED(arg), RenderStats *rs) { + if (rs->infostr == NULL) { + return; + } + uintptr_t mem_in_use, peak_memory; float megs_used_memory, megs_peak_memory; char info_time_str[32]; @@ -208,17 +212,7 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs) info_time_str, sizeof(info_time_str), PIL_check_seconds_timer() - rs->starttime); fprintf(stdout, TIP_("| Time:%s | "), info_time_str); - if (rs->infostr) { - fprintf(stdout, "%s", rs->infostr); - } - else { - fprintf(stdout, - TIP_("Sce: %s Ve:%d Fa:%d La:%d"), - rs->scene_name, - rs->totvert, - rs->totface, - rs->totlamp); - } + fprintf(stdout, "%s", rs->infostr); /* Flush stdout to be sure python callbacks are printing stuff after blender. */ fflush(stdout); |