From e7f814b1a30269a5cf10ae6a701ff3b07d49cbf5 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 30 Jan 2008 05:38:55 +0000 Subject: [PATCH] Added a few more bone colour sets --- source/blender/src/resources.c | 12 ++++++++++++ source/blender/src/space.c | 5 ++--- source/blender/src/usiblender.c | 12 ++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index 3eb0542d7df..d7a905fc72f 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -420,6 +420,18 @@ void BIF_InitTheme(void) 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); /* space view3d */ SETCOL(btheme->tv3d.back, 115, 115, 115, 255); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index be6d5eac0f4..e045e881948 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -3149,12 +3149,11 @@ static void info_dump_customcolorset (void *arg1, void *arg2) #endif // this version generates code that can be copy+paste-ed - printf("Bone Color Set - Code \n"); - printf("\t/* set %d*/ \n", th_curcolset); + printf("Theme '%s': Bone Color Set - Code for Copy+Paste \n", btheme->name); + printf("\t/* set %d */ \n", th_curcolset); printf("\tSETCOL(btheme->tarm[%d].solid, 0x%02x, 0x%02x, 0x%02x, 255); \n", th_curcolset-1, tcs->solid[0], tcs->solid[1], tcs->solid[2]); printf("\tSETCOL(btheme->tarm[%d].select, 0x%02x, 0x%02x, 0x%02x, 255); \n", th_curcolset-1, tcs->select[0], tcs->select[1], tcs->select[2]); printf("\tSETCOL(btheme->tarm[%d].active, 0x%02x, 0x%02x, 0x%02x, 255); \n", th_curcolset-1, tcs->active[0], tcs->active[1], tcs->active[2]); - printf("\n"); } static void info_user_theme_colsets_buts(uiBlock *block, short y1, short y2, short y3, short y4) diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 83cbb695f99..80465e5e9fb 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -454,6 +454,18 @@ static void init_userdef_file(void) 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); } } }