diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 18:54:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 18:54:29 +0400 |
| commit | 619927605355a0b66e1ecd8f8a8bf1fe31b68d07 (patch) | |
| tree | 384a5b47f09aeeb30f984216e0aae6aeb68c2e0f /source/blender/editors/space_info/info_stats.c | |
| parent | 2dc6b8f835b87480a9451c91e684271a55554006 (diff) | |
| parent | 3c43e8e50ac991b082c143c634e4776aaca02db1 (diff) | |
svn merge -r37800:37900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/space_info/info_stats.c')
| -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 6a48dc4d004..0a384018c8a 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -348,13 +348,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; @@ -370,6 +371,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)) |