diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-04-28 15:40:38 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-04-28 15:40:38 +0400 |
| commit | dfbc6213b5d45ec792e76edc13f8fdaf45015043 (patch) | |
| tree | 9bad1dbe37c7326eaeafd17ce5954a2de13f8312 /source/blender | |
| parent | 2706c622318ab0f60dcddbe92b429eda81fbd8eb (diff) | |
== Action Editor - Group Colors ==
Made option to show group colors the default. If this is too colourful for you, disable it in the View menu.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 4 | ||||
| -rw-r--r-- | source/blender/src/drawaction.c | 2 | ||||
| -rw-r--r-- | source/blender/src/header_action.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 26b7e3c1013..18d2a1cb6f3 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -234,8 +234,8 @@ typedef enum SACTION_FLAG { SACTION_HORIZOPTIMISEON = (1<<5), /* hack for moving pose-markers (temp flag) */ SACTION_POSEMARKERS_MOVE = (1<<6), - /* draw action channels using group colours (where applicable) */ - SACTION_DRAWGCOLORS = (1<<7) + /* don't draw action channels using group colours (where applicable) */ + SACTION_NODRAWGCOLORS = (1<<7) } SACTION_FLAG; /* SpaceAction AutoSnap Settings (also used by SpaceNLA) */ diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index 459a9983793..1a742440e9b 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -637,7 +637,7 @@ static void draw_channel_names(void) * - use 3 shades of color group/standard colour for 3 indention level * - only use group colors if allowed to, and if actually feasible */ - if ( (G.saction->flag & SACTION_DRAWGCOLORS) && + if ( !(G.saction->flag & SACTION_NODRAWGCOLORS) && (grp) && (grp->customCol) ) { char cp[3]; diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 503688aff69..ed3d6a36d0e 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -347,7 +347,7 @@ static void do_action_viewmenu(void *arg, int event) G.saction->flag ^= SACTION_HORIZOPTIMISEON; break; case ACTMENU_VIEW_GCOLORS: /* Draw grouped-action channels using its group's color */ - G.saction->flag ^= SACTION_DRAWGCOLORS; + G.saction->flag ^= SACTION_NODRAWGCOLORS; break; } allqueue(REDRAWVIEW3D, 0); @@ -395,7 +395,7 @@ static uiBlock *action_viewmenu(void *arg_unused) menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_VIEW_NOHIDE, ""); - uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_DRAWGCOLORS)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, + uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NODRAWGCOLORS)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, "Use Group Colors|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_VIEW_GCOLORS, ""); |