diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-14 21:29:53 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-14 21:29:53 +0400 |
| commit | fa46278e347ca173e9e6d6b734a59c268f4fc9d0 (patch) | |
| tree | a14148822e60cb1f8f36dba0481b830cb9675db1 /source/blender/editors/space_info | |
| parent | 470a5017fb80f21bac08373e4b5816c92d42990a (diff) | |
| parent | 4da4943b5ce9514e9fb3d9458f3e52d6b0d310ca (diff) | |
merge from trunk 38379
Diffstat (limited to 'source/blender/editors/space_info')
| -rw-r--r-- | source/blender/editors/space_info/info_stats.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 42ee2112fe8..0abfd4b71a1 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -357,13 +357,14 @@ static void stats_update(Scene *scene) } if(!scene->stats) - scene->stats= MEM_mallocN(sizeof(SceneStats), "SceneStats"); + scene->stats= MEM_callocN(sizeof(SceneStats), "SceneStats"); *(scene->stats)= stats; } static void stats_string(Scene *scene) { + extern char versionstr[]; /* from blender.c */ SceneStats *stats= scene->stats; Object *ob= (scene->basact)? scene->basact->object: NULL; uintptr_t mem_in_use, mmap_in_use; @@ -379,6 +380,8 @@ static void stats_string(Scene *scene) sprintf(s, " (%.2fM)", (double)((mmap_in_use)>>10)/1024.0); s= stats->infostr; + + s+= sprintf(s, "%s | ", versionstr); if(scene->obedit) { if(ob_get_keyblock(scene->obedit)) |