Revision: 19053
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19053
Author: aligorith
Date: 2009-02-20 07:30:47 +0100 (Fri, 20 Feb 2009)
Log Message:
-----------
2.5 Userprefs/Themes version patching
Brought back many missing conversions. Dunno why so many of them weren't
present.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-02-20 06:05:00 UTC (rev 19052)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-02-20 06:30:47 UTC (rev 19053)
@@ -325,6 +325,117 @@
SETCOL(btheme->ttime.cframe, 0x60, 0xc0, 0x40, 255);
}
}
+ if ((G.main->versionfile < 245) || (G.main->versionfile == 245 &&
G.main->subversionfile < 11)) {
+ bTheme *btheme;
+ for (btheme= U.themes.first; btheme; btheme= btheme->next) {
+ /* these should all use the same color */
+ SETCOL(btheme->tv3d.cframe, 0x60, 0xc0, 0x40, 255);
+ SETCOL(btheme->tipo.cframe, 0x60, 0xc0, 0x40, 255);
+ SETCOL(btheme->tact.cframe, 0x60, 0xc0, 0x40, 255);
+ SETCOL(btheme->tnla.cframe, 0x60, 0xc0, 0x40, 255);
+ SETCOL(btheme->tseq.cframe, 0x60, 0xc0, 0x40, 255);
+ SETCOL(btheme->tsnd.cframe, 0x60, 0xc0, 0x40, 255);
+ SETCOL(btheme->ttime.cframe, 0x60, 0xc0, 0x40, 255);
+ }
+ }
+ if ((G.main->versionfile < 245) || (G.main->versionfile == 245 &&
G.main->subversionfile < 13)) {
+ bTheme *btheme;
+ for (btheme= U.themes.first; btheme; btheme= btheme->next) {
+ /* action channel groups (recolor anyway) */
+ SETCOL(btheme->tact.group, 0x39, 0x7d, 0x1b, 255);
+ SETCOL(btheme->tact.group_active, 0x7d, 0xe9, 0x60,
255);
+
+ /* bone custom-color sets */
+ // FIXME: this check for initialised colors is bad
+ if (btheme->tarm[0].solid[3] == 0) {
+ /* set 1 */
+ SETCOL(btheme->tarm[0].solid, 0x9a, 0x00, 0x00,
255);
+ SETCOL(btheme->tarm[0].select, 0xbd, 0x11,
0x11, 255);
+ SETCOL(btheme->tarm[0].active, 0xf7, 0x0a,
0x0a, 255);
+ /* set 2 */
+ SETCOL(btheme->tarm[1].solid, 0xf7, 0x40, 0x18,
255);
+ SETCOL(btheme->tarm[1].select, 0xf6, 0x69,
0x13, 255);
+ SETCOL(btheme->tarm[1].active, 0xfa, 0x99,
0x00, 255);
+ /* set 3 */
+ SETCOL(btheme->tarm[2].solid, 0x1e, 0x91, 0x09,
255);
+ SETCOL(btheme->tarm[2].select, 0x59, 0xb7,
0x0b, 255);
+ SETCOL(btheme->tarm[2].active, 0x83, 0xef,
0x1d, 255);
+ /* set 4 */
+ SETCOL(btheme->tarm[3].solid, 0x0a, 0x36, 0x94,
255);
+ SETCOL(btheme->tarm[3].select, 0x36, 0x67,
0xdf, 255);
+ SETCOL(btheme->tarm[3].active, 0x5e, 0xc1,
0xef, 255);
+ /* set 5 */
+ SETCOL(btheme->tarm[4].solid, 0xa9, 0x29, 0x4e,
255);
+ SETCOL(btheme->tarm[4].select, 0xc1, 0x41,
0x6a, 255);
+ SETCOL(btheme->tarm[4].active, 0xf0, 0x5d,
0x91, 255);
+ /* set 6 */
+ SETCOL(btheme->tarm[5].solid, 0x43, 0x0c, 0x78,
255);
+ SETCOL(btheme->tarm[5].select, 0x54, 0x3a,
0xa3, 255);
+ SETCOL(btheme->tarm[5].active, 0x87, 0x64,
0xd5, 255);
+ /* set 7 */
+ SETCOL(btheme->tarm[6].solid, 0x24, 0x78, 0x5a,
255);
+ SETCOL(btheme->tarm[6].select, 0x3c, 0x95,
0x79, 255);
+ SETCOL(btheme->tarm[6].active, 0x6f, 0xb6,
0xab, 255);
+ /* set 8 */
+ SETCOL(btheme->tarm[7].solid, 0x4b, 0x70, 0x7c,
255);
+ SETCOL(btheme->tarm[7].select, 0x6a, 0x86,
0x91, 255);
+ SETCOL(btheme->tarm[7].active, 0x9b, 0xc2,
0xcd, 255);
+ /* set 9 */
+ SETCOL(btheme->tarm[8].solid, 0xf4, 0xc9, 0x0c,
255);
+ SETCOL(btheme->tarm[8].select, 0xee, 0xc2,
0x36, 255);
+ SETCOL(btheme->tarm[8].active, 0xf3, 0xff,
0x00, 255);
+ /* set 10 */
+ SETCOL(btheme->tarm[9].solid, 0x1e, 0x20, 0x24,
255);
+ SETCOL(btheme->tarm[9].select, 0x48, 0x4c,
0x56, 255);
+ SETCOL(btheme->tarm[9].active, 0xff, 0xff,
0xff, 255);
+ /* set 11 */
+ SETCOL(btheme->tarm[10].solid, 0x6f, 0x2f,
0x6a, 255);
+ SETCOL(btheme->tarm[10].select, 0x98, 0x45,
0xbe, 255);
+ SETCOL(btheme->tarm[10].active, 0xd3, 0x30,
0xd6, 255);
+ /* set 12 */
+ SETCOL(btheme->tarm[11].solid, 0x6c, 0x8e,
0x22, 255);
+ SETCOL(btheme->tarm[11].select, 0x7f, 0xb0,
0x22, 255);
+ SETCOL(btheme->tarm[11].active, 0xbb, 0xef,
0x5b, 255);
+ /* set 13 */
+ SETCOL(btheme->tarm[12].solid, 0x8d, 0x8d,
0x8d, 255);
+ SETCOL(btheme->tarm[12].select, 0xb0, 0xb0,
0xb0, 255);
+ SETCOL(btheme->tarm[12].active, 0xde, 0xde,
0xde, 255);
+ /* set 14 */
+ SETCOL(btheme->tarm[13].solid, 0x83, 0x43,
0x26, 255);
+ SETCOL(btheme->tarm[13].select, 0x8b, 0x58,
0x11, 255);
+ SETCOL(btheme->tarm[13].active, 0xbd, 0x6a,
0x11, 255);
+ /* set 15 */
+ SETCOL(btheme->tarm[14].solid, 0x08, 0x31,
0x0e, 255);
+ SETCOL(btheme->tarm[14].select, 0x1c, 0x43,
0x0b, 255);
+ SETCOL(btheme->tarm[14].active, 0x34, 0x62,
0x2b, 255);
+ }
+ }
+ }
+ if ((G.main->versionfile < 245) || (G.main->versionfile == 245 &&
G.main->subversionfile < 16)) {
+ U.flag |= USER_ADD_VIEWALIGNED|USER_ADD_EDITMODE;
+ }
+ if ((G.main->versionfile < 247) || (G.main->versionfile == 247 &&
G.main->subversionfile <= 2)) {
+ bTheme *btheme;
+
+ /* adjust themes */
+ for (btheme= U.themes.first; btheme; btheme= btheme->next) {
+ char *col;
+
+ /* IPO Editor: Handles/Vertices */
+ col = btheme->tipo.vertex;
+ SETCOL(btheme->tipo.handle_vertex, col[0], col[1],
col[2], 255);
+ col = btheme->tipo.vertex_select;
+ SETCOL(btheme->tipo.handle_vertex_select, col[0],
col[1], col[2], 255);
+ btheme->tipo.handle_vertex_size=
btheme->tipo.vertex_size;
+
+ /* Sequence/Image Editor: colors for GPencil text */
+ col = btheme->tv3d.bone_pose;
+ SETCOL(btheme->tseq.bone_pose, col[0], col[1], col[2],
255);
+ SETCOL(btheme->tima.bone_pose, col[0], col[1], col[2],
255);
+ col = btheme->tv3d.vertex_select;
+ SETCOL(btheme->tseq.vertex_select, col[0], col[1],
col[2], 255);
+ }
+ }
if (G.main->versionfile < 250) {
bTheme *btheme;
@@ -344,11 +455,11 @@
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);
+ /* Graph Editor - Group Channel color */
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);
}
/* adjust grease-pencil distances */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
