diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-10-30 12:57:46 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-11-09 13:11:05 +0300 |
commit | ad85256e71081016fe7b4009f8a0c0cd7e18dafe (patch) | |
tree | cd0eb7f225c2282d4be71d5f9ff55553d1cf0207 /source/blender/makesdna | |
parent | 25375c769a158c54396f60b9ceecd3c267871f3e (diff) |
Animation: move group colors switch to user preferences
Move the "Show Group Colors" toggle from a per-editor option to a single
user preference in the Animation preferences. The Grease Pencil
animation channel side panel allows picking a channel color; this now
shows a message when channel colors are disabled.
The old "Show Group Colors" toggle had to be set per editor, and was on
by default. This meant that disabling group colors would require an
action for every file, for every editor. It is very hard to select a
color that works both as bone color in the 3D Viewport (needs to be
bright there) as well as the channel list (needs to be dark there), most
animators turn channel list colors off.
Differential Revision: https://developer.blender.org/D9391
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 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 13 |
3 files changed, 13 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index ac6160b28e4..790a7a36288 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -857,7 +857,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), + /* SACTION_NODRAWGCOLORS = (1 << 7), DEPRECATED */ /* SACTION_NODRAWCFRANUM = (1 << 8), DEPRECATED */ /* don't perform realtime updates */ SACTION_NOREALTIMEUPDATES = (1 << 10), diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 1b7ec3889bc..80703782f18 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -465,7 +465,7 @@ typedef enum eGraphEdit_Flag { /* don't draw curves with AA ("beauty-draw") for performance */ SIPO_BEAUTYDRAW_OFF = (1 << 12), /* draw grouped channels with colors set in group */ - SIPO_NODRAWGCOLORS = (1 << 13), + /* SIPO_NODRAWGCOLORS = (1 << 13), DEPRECATED */ /* normalize curves on display */ SIPO_NORMALIZE = (1 << 14), SIPO_NORMALIZE_FREEZE = (1 << 15), diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index ed232d4ad89..a9bd915ba48 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -826,13 +826,13 @@ typedef struct UserDef { short autokey_mode; /** Flags for autokeying. */ short autokey_flag; + /** Flags for animation. */ + short animation_flag; /** Options for text rendering. */ char text_render; char navigation_mode; - char _pad9[2]; - /** Turn-table rotation amount per-pixel in radians. Scaled with DPI. */ float view_rotate_sensitivity_turntable; /** Track-ball rotation scale. */ @@ -1147,6 +1147,15 @@ typedef enum eAutokey_Flag { ANIMRECORD_FLAG_WITHNLA = (1 << 10), } eAutokey_Flag; +/** + * Animation flags + * #UserDef.animation_flag, used for animation flags that aren't covered by more specific flags + * (like eAutokey_Flag). + */ +typedef enum eUserpref_Anim_Flags { + USER_ANIM_SHOW_CHANNEL_GROUP_COLORS = (1 << 0), +} eUserpref_Anim_Flags; + /** #UserDef.transopts */ typedef enum eUserpref_Translation_Flags { USER_TR_TOOLTIPS = (1 << 0), |