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 /release | |
| 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 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 9 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index e41858587bf..8201ce080b1 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -881,13 +881,18 @@ class GreasePencilLayerDisplayPanel: gpd = ob.data gpl = gpd.layers.active - row = layout.row(align=True) + use_colors = context.preferences.edit.use_anim_channel_group_colors + + col = layout.column(align=True) + col.active = use_colors + row = col.row(align=True) row.prop(gpl, "channel_color") + if not use_colors: + col.label(text="Channel Colors are disabled in Animation preferences") row = layout.row(align=True) row.prop(gpl, "use_solo_mode", text="Show Only on Keyframed") - class GreasePencilFlipTintColors(Operator): bl_label = "Flip Colors" bl_idname = "gpencil.tint_flip" diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 9a716621b08..676e93f4ce9 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -347,7 +347,6 @@ class DOPESHEET_MT_view(Menu): col.active = context.space_data.mode != 'SHAPEKEY' col.prop(st, "show_sliders") - layout.prop(st, "show_group_colors") layout.prop(st, "show_interpolation") layout.prop(st, "show_extremes") layout.prop(st, "use_auto_merge_keyframes") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 8c1409f00ac..91871acfbc5 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -543,6 +543,7 @@ class USERPREF_PT_animation_fcurves(AnimationPanel, CenterAlignMixIn, Panel): flow.prop(edit, "keyframe_new_interpolation_type", text="Default Interpolation") flow.prop(edit, "keyframe_new_handle_type", text="Default Handles") flow.prop(edit, "use_insertkey_xyz_to_rgb", text="XYZ to RGB") + flow.prop(edit, "use_anim_channel_group_colors") # ----------------------------------------------------------------------------- |