diff options
author | Joshua Leung <aligorith@gmail.com> | 2012-05-24 05:25:31 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2012-05-24 05:25:31 +0400 |
commit | 8e97203f7d1101d8069b22f0f9a5666812704e22 (patch) | |
tree | 160ce3d1d9751745629d71c42ce3f6f963698843 /source/blender/makesdna | |
parent | 57b488574a0720eb749e9daa16df1979db9bbe6f (diff) |
Restoring Group Colours for Animation Channels - Part 1
This commit restores the group colours support for F-Curves and F-Curve Groups
in the DopeSheet and Graph Editors. Currently the relevant settings for groups
are only exposed via RNA, but a followup commit will add support for
automatically setting these colours. By default, DopeSheet and Graph Editors are
set to display these colours if/when they are available.
This functionality used to be in 2.48, and is a useful mechanism for visually
distinguishing between channels for different controls when animating (if group
colours are used on the rigs too).
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 30b3e75255d..9cb5ca5da55 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -612,7 +612,7 @@ typedef enum eSAction_Flag { /* show pose-markers (local to action) in Action Editor mode */ SACTION_POSEMARKERS_SHOW = (1<<6), /* don't draw action channels using group colors (where applicable) */ - SACTION_NODRAWGCOLORS = (1<<7), // XXX depreceated... irrelevant for current groups implementation + SACTION_NODRAWGCOLORS = (1<<7), /* don't draw current frame number beside frame indicator */ SACTION_NODRAWCFRANUM = (1<<8), /* temporary flag to force channel selections to be synced with main */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 0bc91907d6e..375258cb92b 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -763,6 +763,8 @@ enum FileSortTypeE { #define SIPO_NOREALTIMEUPDATES (1<<11) /* don't draw curves with AA ("beauty-draw") for performance */ #define SIPO_BEAUTYDRAW_OFF (1<<12) + /* draw grouped channels with colors set in group */ +#define SIPO_NODRAWGCOLORS (1<<13) /* SpaceIpo->mode (Graph Editor Mode) */ enum { |