Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release/scripts/startup/bl_ui/space_dopesheet.py')
-rw-r--r--release/scripts/startup/bl_ui/space_dopesheet.py27
1 files changed, 12 insertions, 15 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 3f8c41e4f21..676e93f4ce9 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -228,13 +228,7 @@ class DOPESHEET_HT_header(Header):
# Header for "normal" dopesheet editor modes (e.g. Dope Sheet, Action, Shape Keys, etc.)
-class DOPESHEET_HT_editor_buttons(Header):
- bl_idname = "DOPESHEET_HT_editor_buttons"
- bl_space_type = 'DOPESHEET_EDITOR'
- bl_label = ""
-
- def draw(self, context):
- pass
+class DOPESHEET_HT_editor_buttons:
@staticmethod
def draw_header(context, layout):
@@ -342,13 +336,17 @@ class DOPESHEET_MT_view(Menu):
layout.separator()
- layout.prop(st.dopesheet, "use_multi_word_filter", text="Multi-word Match Search")
+ layout.prop(st.dopesheet, "use_multi_word_filter", text="Multi-Word Match Search")
layout.separator()
layout.prop(st, "use_realtime_update")
- layout.prop(st, "show_sliders")
- layout.prop(st, "show_group_colors")
+
+ # Sliders are always shown in the Shape Key Editor regardless of this setting.
+ col = layout.column()
+ col.active = context.space_data.mode != 'SHAPEKEY'
+ col.prop(st, "show_sliders")
+
layout.prop(st, "show_interpolation")
layout.prop(st, "show_extremes")
layout.prop(st, "use_auto_merge_keyframes")
@@ -669,10 +667,10 @@ class DOPESHEET_MT_snap_pie(Menu):
layout = self.layout
pie = layout.menu_pie()
- pie.operator("action.snap", text="Current Frame").type = 'CFRA'
- pie.operator("action.snap", text="Nearest Frame").type = 'NEAREST_FRAME'
- pie.operator("action.snap", text="Nearest Second").type = 'NEAREST_SECOND'
- pie.operator("action.snap", text="Nearest Marker").type = 'NEAREST_MARKER'
+ pie.operator("action.snap", text="Selection to Current Frame").type = 'CFRA'
+ pie.operator("action.snap", text="Selection to Nearest Frame").type = 'NEAREST_FRAME'
+ pie.operator("action.snap", text="Selection to Nearest Second").type = 'NEAREST_SECOND'
+ pie.operator("action.snap", text="Selection to Nearest Marker").type = 'NEAREST_MARKER'
class LayersDopeSheetPanel:
@@ -746,7 +744,6 @@ class DOPESHEET_PT_gpencil_layer_display(LayersDopeSheetPanel, GreasePencilLayer
classes = (
DOPESHEET_HT_header,
- DOPESHEET_HT_editor_buttons,
DOPESHEET_MT_editor_menus,
DOPESHEET_MT_view,
DOPESHEET_MT_select,