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:
authorJoshua Leung <aligorith@gmail.com>2015-04-02 16:10:20 +0300
committerJoshua Leung <aligorith@gmail.com>2015-04-02 16:17:45 +0300
commit018dc3aeda4ae637a134b043ced15d2c037ddc41 (patch)
tree76bd74b2485acb44bbb074165a44bdb1ce086dbe
parent5d4beee8c651b193c64657665a97796eaf147ee7 (diff)
Action Editor: Experimental tweak to ordering of buttons
This commit is an experiment exploring the relationship between the action management buttons (i.e. action selector + pushdown/stash, and soon a few others) and the filtering stuff (i.e. summary, only selected, etc.) The old ordering meant that the filtering stuff was consistently in the same place beside the mode selector, meaning that the order was "common stuff, then editor specific stuff", this was not that great on smaller windows, where there important stuff was often out of view. This new order places greater emphasis on the parts which are likely to be more important. It also allows us to have a better hierarchy/flow; this is especially because we'll soon introduce a way to specify which datablock "level" the action comes from, so going from "level -> action -> filters within action" will make more sense.
-rw-r--r--release/scripts/startup/bl_ui/space_dopesheet.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 5358670c2f2..2d362149d8b 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -112,6 +112,14 @@ class DOPESHEET_HT_header(Header):
DOPESHEET_MT_editor_menus.draw_collapsible(context, layout)
layout.prop(st, "mode", text="")
+
+ if st.mode in {'ACTION', 'SHAPEKEY'}:
+ layout.template_ID(st, "action", new="action.new")
+
+ row = layout.row(align=True)
+ row.operator("action.push_down", text="Push Down", icon='NLA_PUSHDOWN')
+ row.operator("action.stash", text="Stash", icon='FREEZE')
+
layout.prop(st.dopesheet, "show_summary", text="Summary")
if st.mode == 'DOPESHEET':
@@ -121,13 +129,6 @@ class DOPESHEET_HT_header(Header):
# filters which will work here and are useful (especially for character animation)
dopesheet_filter(layout, context, genericFiltersOnly=True)
- if st.mode in {'ACTION', 'SHAPEKEY'}:
- layout.template_ID(st, "action", new="action.new")
-
- row = layout.row(align=True)
- row.operator("action.push_down", text="Push Down", icon='NLA_PUSHDOWN')
- row.operator("action.stash", text="Stash", icon='FREEZE')
-
# Grease Pencil mode doesn't need snapping, as it's frame-aligned only
if st.mode != 'GPENCIL':
layout.prop(st, "auto_snap", text="")