griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merging r49253 through r49254 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin
2012-07-26 15:51:33 +00:00
parent 0ca416424b fb520785b6
commit e35d1ee8b8
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender.h
View File

@@ -42,7 +42,7 @@ extern "C" {
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 263
#define BLENDER_SUBVERSION 15
#define BLENDER_SUBVERSION 16
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0

12
source/blender/editors/interface/resources.c
View File

@@ -1924,6 +1924,18 @@ void init_userdef_do_versions(void)
}
}
if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 16)) {
bTheme *btheme;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
if (btheme->tact.anim_active[3] == 0)
rgba_char_args_set(btheme->tact.anim_active, 204, 112, 26, 102);
if (btheme->tnla.anim_active[3] == 0)
rgba_char_args_set(btheme->tnla.anim_active, 204, 112, 26, 102);
}
}
/* GL Texture Garbage Collection (variable abused above!) */
if (U.textimeout == 0) {
U.texcollectrate = 60;