diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-02-20 09:04:06 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-02-20 09:04:06 +0300 |
| commit | be83d8d07a0a3003335092555205df3aa9cb0b95 (patch) | |
| tree | 377eeb1e3d5e6414bda011c49685544e8ec17743 /source/blender/windowmanager | |
| parent | c666a790df53756be3b65937d6953e9b999cbf6e (diff) | |
2.5 - Moved version-patch for animation related settings/theme-colours in .B.blend files to the < 250 check.
Hopefully, this solves the issues with the default keyframe interpolation mode being initialised to 'constant' on some old .B.blend files.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 7fc0efc4370..3e5fbfba084 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -325,18 +325,27 @@ static void init_userdef_themes(void) SETCOL(btheme->ttime.cframe, 0x60, 0xc0, 0x40, 255); } } - if ((G.main->versionfile < 248) || (G.main->versionfile == 248 && G.main->subversionfile < 3)) { + if (G.main->versionfile < 250) { bTheme *btheme; - /* adjust themes */ - for (btheme= U.themes.first; btheme; btheme= btheme->next) { + for(btheme= U.themes.first; btheme; btheme= btheme->next) { + /* this was not properly initialized in 2.45 */ + if(btheme->tima.face_dot[3]==0) { + SETCOL(btheme->tima.editmesh_active, 255, 255, 255, 128); + SETCOL(btheme->tima.face_dot, 255, 133, 0, 255); + btheme->tima.facedot_size= 2; + } + /* DopeSheet - (Object) Channel color */ SETCOL(btheme->tact.ds_channel, 82, 96, 110, 255); SETCOL(btheme->tact.ds_subchannel, 124, 137, 150, 255); + /* DopeSheet - Group Channel color (saner version) */ + SETCOL(btheme->tact.group, 79, 101, 73, 255); + SETCOL(btheme->tact.group_active, 135, 177, 125, 255); /* Graph Editor - (Object) Channel color */ - SETCOL(btheme->tipo.ds_channel, 82, 96, 110, 255); - SETCOL(btheme->tipo.ds_subchannel, 124, 137, 150, 255); + SETCOL(btheme->tipo.group, 79, 101, 73, 255); + SETCOL(btheme->tipo.group_active, 135, 177, 125, 255); /* Graph Editor - Group Channel color */ SETCOL(btheme->tipo.group, 22, 112, 0, 255); SETCOL(btheme->tipo.group_active, 125, 233, 96, 255); @@ -349,18 +358,6 @@ static void init_userdef_themes(void) /* adjust default interpolation for new IPO-curves */ U.ipo_new= BEZT_IPO_BEZ; } - if (G.main->versionfile < 250) { - bTheme *btheme; - - /* this was not properly initialized in 2.45 */ - for(btheme= U.themes.first; btheme; btheme= btheme->next) { - if(btheme->tima.face_dot[3]==0) { - SETCOL(btheme->tima.editmesh_active, 255, 255, 255, 128); - SETCOL(btheme->tima.face_dot, 255, 133, 0, 255); - btheme->tima.facedot_size= 2; - } - } - } /* GL Texture Garbage Collection (variable abused above!) */ if (U.textimeout == 0) { |