Joshua Leung
db4609eb08
This commit restores the ability to reorder channels in the animation editors (DopeSheet/Action/etc., Graph/Drivers, NLA). The hotkeys for this are: - Shift-PageUp = Move Up - Shift-PageDown = Move Down - Ctrl-Shift-PageUp = Move to Top of List - Ctrl-Shift-PageDown = Move to Bottom of List Do note that only animation data can get reordered using this. So, do not expect to be able to change the object order (that is actually taken from the order that Blender actually evaluates them per update/frame). --- In the process, I've fixed a couple of other bugs: * Removed 'optimisation step' check in anim_filter.c for dopesheet with no filtering options modified, since this meant that the ANIMFILTER_ANIMDATA data filter was not getting processed (and potentially there were other maintenance problems with that). * Made NLA Editor's channel list not totally duplicate the basic Animation Channels keymap. Instead, the "NLA Channels" keymap now only defines the parts that are different, and this then gets specified before the standard one so that these different parts will override the standard ones. * Attempted to fix BorderSelect on NLA Channels list. Still not totally working correctly yet though. * Moved "Euler Discontinuity" menu entry from "Channels" to "Keys". It really belongs in the latter, since it affects the keyframe values, rather than some aspect of the channel (i.e. ordering of channels or how they're displayed)
261 lines
8.3 KiB
Python
261 lines
8.3 KiB
Python
# ##### BEGIN GPL LICENSE BLOCK #####
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
#
|
|
# ##### END GPL LICENSE BLOCK #####
|
|
|
|
# <pep8 compliant>
|
|
|
|
import bpy
|
|
|
|
# used for DopeSheet, NLA, and Graph Editors
|
|
def dopesheet_filter(layout, context):
|
|
dopesheet = context.space_data.dopesheet
|
|
is_nla = context.area.type == 'NLA_EDITOR'
|
|
|
|
row = layout.row(align=True)
|
|
row.prop(dopesheet, "show_only_selected", text="")
|
|
row.prop(dopesheet, "show_hidden", text="")
|
|
|
|
row = layout.row(align=True)
|
|
row.prop(dopesheet, "show_transforms", text="")
|
|
|
|
if is_nla:
|
|
row.prop(dopesheet, "show_missing_nla", text="")
|
|
|
|
row = layout.row(align=True)
|
|
row.prop(dopesheet, "show_scenes", text="")
|
|
row.prop(dopesheet, "show_worlds", text="")
|
|
row.prop(dopesheet, "show_nodes", text="")
|
|
|
|
if bpy.data.meshes:
|
|
row.prop(dopesheet, "show_meshes", text="")
|
|
if bpy.data.shape_keys:
|
|
row.prop(dopesheet, "show_shapekeys", text="")
|
|
if bpy.data.materials:
|
|
row.prop(dopesheet, "show_materials", text="")
|
|
if bpy.data.lamps:
|
|
row.prop(dopesheet, "show_lamps", text="")
|
|
if bpy.data.textures:
|
|
row.prop(dopesheet, "show_textures", text="")
|
|
if bpy.data.cameras:
|
|
row.prop(dopesheet, "show_cameras", text="")
|
|
if bpy.data.curves:
|
|
row.prop(dopesheet, "show_curves", text="")
|
|
if bpy.data.metaballs:
|
|
row.prop(dopesheet, "show_metaballs", text="")
|
|
if bpy.data.armatures:
|
|
row.prop(dopesheet, "show_armatures", text="")
|
|
if bpy.data.particles:
|
|
row.prop(dopesheet, "show_particles", text="")
|
|
|
|
if bpy.data.groups:
|
|
row = layout.row(align=True)
|
|
row.prop(dopesheet, "show_only_group_objects", text="")
|
|
if dopesheet.show_only_group_objects:
|
|
row.prop(dopesheet, "filter_group", text="")
|
|
|
|
|
|
class DOPESHEET_HT_header(bpy.types.Header):
|
|
bl_space_type = 'DOPESHEET_EDITOR'
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
st = context.space_data
|
|
|
|
row = layout.row(align=True)
|
|
row.template_header()
|
|
|
|
if context.area.show_menus:
|
|
sub = row.row(align=True)
|
|
|
|
sub.menu("DOPESHEET_MT_view")
|
|
sub.menu("DOPESHEET_MT_select")
|
|
|
|
if st.mode == 'DOPESHEET' or (st.mode == 'ACTION' and st.action != None):
|
|
sub.menu("DOPESHEET_MT_channel")
|
|
elif st.mode == 'GPENCIL':
|
|
# gpencil Channel menu
|
|
pass
|
|
|
|
if st.mode != 'GPENCIL':
|
|
sub.menu("DOPESHEET_MT_key")
|
|
|
|
layout.prop(st, "mode", text="")
|
|
layout.prop(st.dopesheet, "show_summary", text="Summary")
|
|
|
|
if st.mode == 'DOPESHEET':
|
|
dopesheet_filter(layout, context)
|
|
|
|
elif st.mode in ('ACTION','SHAPEKEY'):
|
|
layout.template_ID(st, "action", new="action.new")
|
|
|
|
if st.mode != 'GPENCIL':
|
|
layout.prop(st, "auto_snap", text="")
|
|
|
|
row = layout.row(align=True)
|
|
row.operator("action.copy", text="", icon='COPYDOWN')
|
|
row.operator("action.paste", text="", icon='PASTEDOWN')
|
|
|
|
|
|
class DOPESHEET_MT_view(bpy.types.Menu):
|
|
bl_label = "View"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
st = context.space_data
|
|
|
|
layout.column()
|
|
|
|
layout.prop(st, "use_realtime_update")
|
|
layout.prop(st, "show_frame_indicator")
|
|
layout.prop(st, "show_sliders")
|
|
layout.prop(st, "use_auto_merge_keyframes")
|
|
layout.prop(st, "use_marker_sync")
|
|
|
|
if st.show_seconds:
|
|
layout.operator("anim.time_toggle", text="Show Frames")
|
|
else:
|
|
layout.operator("anim.time_toggle", text="Show Seconds")
|
|
|
|
layout.separator()
|
|
layout.operator("anim.previewrange_set")
|
|
layout.operator("anim.previewrange_clear")
|
|
layout.operator("action.previewrange_set")
|
|
|
|
layout.separator()
|
|
layout.operator("action.frame_jump")
|
|
layout.operator("action.view_all")
|
|
|
|
layout.separator()
|
|
layout.operator("screen.area_dupli")
|
|
layout.operator("screen.screen_full_area")
|
|
|
|
|
|
class DOPESHEET_MT_select(bpy.types.Menu):
|
|
bl_label = "Select"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
layout.column()
|
|
# This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
|
|
layout.operator("action.select_all_toggle")
|
|
layout.operator("action.select_all_toggle", text="Invert Selection").invert = True
|
|
|
|
layout.separator()
|
|
layout.operator("action.select_border")
|
|
layout.operator("action.select_border", text="Border Axis Range").axis_range = True
|
|
|
|
layout.separator()
|
|
layout.operator("action.select_column", text="Columns on Selected Keys").mode = 'KEYS'
|
|
layout.operator("action.select_column", text="Column on Current Frame").mode = 'CFRA'
|
|
|
|
layout.operator("action.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
|
|
layout.operator("action.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
|
|
|
|
layout.separator()
|
|
layout.operator("action.select_more")
|
|
layout.operator("action.select_less")
|
|
|
|
layout.separator()
|
|
layout.operator("action.select_linked")
|
|
|
|
|
|
class DOPESHEET_MT_channel(bpy.types.Menu):
|
|
bl_label = "Channel"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
layout.operator_context = 'INVOKE_REGION_CHANNELS'
|
|
|
|
layout.column()
|
|
layout.operator("anim.channels_delete")
|
|
|
|
layout.separator()
|
|
layout.operator("anim.channels_setting_toggle")
|
|
layout.operator("anim.channels_setting_enable")
|
|
layout.operator("anim.channels_setting_disable")
|
|
|
|
layout.separator()
|
|
layout.operator("anim.channels_editable_toggle")
|
|
|
|
layout.separator()
|
|
layout.operator("anim.channels_expand")
|
|
layout.operator("anim.channels_collapse")
|
|
|
|
layout.separator()
|
|
layout.operator_menu_enum("anim.channels_move", "direction", text="Move...")
|
|
|
|
class DOPESHEET_MT_key(bpy.types.Menu):
|
|
bl_label = "Key"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
layout.column()
|
|
layout.menu("DOPESHEET_MT_key_transform", text="Transform")
|
|
|
|
layout.operator_menu_enum("action.snap", "type", text="Snap")
|
|
layout.operator_menu_enum("action.mirror", "type", text="Mirror")
|
|
|
|
layout.separator()
|
|
layout.operator("action.keyframe_insert")
|
|
|
|
layout.separator()
|
|
layout.operator("action.duplicate")
|
|
layout.operator("action.delete")
|
|
|
|
layout.separator()
|
|
layout.operator_menu_enum("action.keyframe_type", "type", text="Keyframe Type")
|
|
layout.operator_menu_enum("action.handle_type", "type", text="Handle Type")
|
|
layout.operator_menu_enum("action.interpolation_type", "type", text="Interpolation Mode")
|
|
layout.operator_menu_enum("action.extrapolation_type", "type", text="Extrapolation Mode")
|
|
|
|
layout.separator()
|
|
layout.operator("action.clean")
|
|
layout.operator("action.sample")
|
|
|
|
layout.separator()
|
|
layout.operator("action.copy")
|
|
layout.operator("action.paste")
|
|
|
|
|
|
class DOPESHEET_MT_key_transform(bpy.types.Menu):
|
|
bl_label = "Transform"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
layout.column()
|
|
layout.operator("transform.transform", text="Grab/Move").mode = 'TIME_TRANSLATE'
|
|
layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
|
|
layout.operator("transform.transform", text="Slide").mode = 'TIME_SLIDE'
|
|
layout.operator("transform.transform", text="Scale").mode = 'TIME_SCALE'
|
|
|
|
|
|
def register():
|
|
pass
|
|
|
|
|
|
def unregister():
|
|
pass
|
|
|
|
if __name__ == "__main__":
|
|
register()
|