archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

== Action Editor - Group Colors ==

Browse Source 
Made option to show group colors the default. If this is too colourful for you, disable it in the View menu.
This commit is contained in:
Joshua Leung
2008-04-28 11:40:38 +00:00
parent 2706c62231
commit dfbc6213b5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesdna/DNA_action_types.h
View File

@@ -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) */

2
source/blender/src/drawaction.c
View File

@@ -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];

4
source/blender/src/header_action.c
View File

@@ -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, "");