Putting back blender.org and release number in info header.
authorTon Roosendaal <ton@blender.org>
Sun, 26 Jun 2011 17:01:10 +0000 (17:01 +0000)
committerTon Roosendaal <ton@blender.org>
Sun, 26 Jun 2011 17:01:10 +0000 (17:01 +0000)
Worked always great for tutorials in past, to check what's been used.

source/blender/blenkernel/intern/blender.c
source/blender/editors/space_info/info_stats.c

index 633a05589cd5cf0369288632792a60c2f2fe1eb4..8b4bbbd3c834ddb203978eefb3208fb747980e6d 100644 (file)
@@ -97,7 +97,7 @@ UserDef U;
 /* ListBase = {NULL, NULL}; */
 short ENDIAN_ORDER;
 
-static char versionstr[48]= "";
+char versionstr[48]= "";
 
 /* ********** free ********** */
 
@@ -133,9 +133,9 @@ void initglobals(void)
        ENDIAN_ORDER= (((char*)&ENDIAN_ORDER)[0])? L_ENDIAN: B_ENDIAN;
 
        if(BLENDER_SUBVERSION)
-               BLI_snprintf(versionstr, sizeof(versionstr), "www.blender.org %d.%d", BLENDER_VERSION, BLENDER_SUBVERSION);
+               BLI_snprintf(versionstr, sizeof(versionstr), "blender.org %d.%d", BLENDER_VERSION, BLENDER_SUBVERSION);
        else
-               BLI_snprintf(versionstr, sizeof(versionstr), "www.blender.org %d", BLENDER_VERSION);
+               BLI_snprintf(versionstr, sizeof(versionstr), "blender.org %d", BLENDER_VERSION);
 
 #ifdef _WIN32  // FULLSCREEN
        G.windowstate = G_WINDOWSTATE_USERDEF;
index 42ee2112fe8d104a98b64939bdc8a227bdb609a3..0abfd4b71a145b6c0225dbd079685ff9925010b1 100644 (file)
@@ -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))