[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37829] trunk/blender/source/blender: Putting back blender.org and release number in info header.
Ton Roosendaal
ton at blender.org
Sun Jun 26 19:01:10 CEST 2011
Revision: 37829
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37829
Author: ton
Date: 2011-06-26 17:01:10 +0000 (Sun, 26 Jun 2011)
Log Message:
-----------
Putting back blender.org and release number in info header.
Worked always great for tutorials in past, to check what's been used.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/editors/space_info/info_stats.c
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2011-06-26 16:52:30 UTC (rev 37828)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2011-06-26 17:01:10 UTC (rev 37829)
@@ -97,7 +97,7 @@
/* ListBase = {NULL, NULL}; */
short ENDIAN_ORDER;
-static char versionstr[48]= "";
+char versionstr[48]= "";
/* ********** free ********** */
@@ -133,9 +133,9 @@
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;
Modified: trunk/blender/source/blender/editors/space_info/info_stats.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_stats.c 2011-06-26 16:52:30 UTC (rev 37828)
+++ trunk/blender/source/blender/editors/space_info/info_stats.c 2011-06-26 17:01:10 UTC (rev 37829)
@@ -357,13 +357,14 @@
}
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 @@
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))
More information about the Bf-blender-cvs
mailing list