cc06e0fbe8
For many years, animators have been requesting the ability to edit keyframes in the timeline. However, implementing such tools in the timeline quickly becomes a slippery slope, where we'll eventually end up having to duplicate all the functionality from the dopesheet editor. Discussing with William and Pablo this morning, we realised that perhaps it might be possible to just make the Timeline a mode of the Dopesheet Editor (and kill off the old standalone Timeline), meaning that we essentially get all the Dopesheet Editor goodness for free! Also, with some proposed UI updates (i.e. allowing "submodes" of editors to be part of the the main editors selector), it might not even matter that there isn't an "actual" timeline editor anymore. This commit implements the following changes (which are actually sufficient for supporting most basic workflows): * Timeline mode in Dopesheet Editor * Tweaks to UI code to make the Timeline header/menus show up in Dopesheet editor TODO: * Hide channels list when switching to timeline mode * Port over cache-file indicators * Add missing timeline-only settings that need a new home in the dopesheet * Go through fixing all timeline editor operators (e.g. Bind to camera) * Port over start/end frame shading (and adjust preview range rendering to make the distinction between these clear) * Remove old timeline editor, and transfer over any leftover code
303 lines
9.3 KiB
Python
303 lines
9.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
|
|
from bpy.types import Header, Menu
|
|
|
|
|
|
class TIME_HT_header(Header):
|
|
bl_space_type = 'TIMELINE'
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
row = layout.row(align=True)
|
|
row.template_header()
|
|
|
|
TIME_MT_editor_menus.draw_collapsible(context, layout)
|
|
TIME_HT_editor_buttons.draw_header(context, layout)
|
|
|
|
|
|
# Header buttons for actual timeline editor header
|
|
# XXX: Temporary, until we have editor submodes in the actual editors menu
|
|
class TIME_HT_editor_buttons(Header):
|
|
bl_idname = "TIME_HT_editor_buttons"
|
|
bl_space_type = 'TIMELINE' # XXX: Change this to 'DOPESHEET_EDITOR'
|
|
bl_label = ""
|
|
|
|
def draw(self, context):
|
|
pass
|
|
|
|
@staticmethod
|
|
def draw_header(context, layout):
|
|
scene = context.scene
|
|
toolsettings = context.tool_settings
|
|
screen = context.screen
|
|
userprefs = context.user_preferences
|
|
|
|
row = layout.row(align=True)
|
|
row.prop(scene, "use_preview_range", text="", toggle=True)
|
|
row.prop(scene, "lock_frame_selection_to_range", text="", toggle=True)
|
|
|
|
row = layout.row(align=True)
|
|
if not scene.use_preview_range:
|
|
row.prop(scene, "frame_start", text="Start")
|
|
row.prop(scene, "frame_end", text="End")
|
|
else:
|
|
row.prop(scene, "frame_preview_start", text="Start")
|
|
row.prop(scene, "frame_preview_end", text="End")
|
|
|
|
if scene.show_subframe:
|
|
layout.prop(scene, "frame_float", text="")
|
|
else:
|
|
layout.prop(scene, "frame_current", text="")
|
|
|
|
layout.separator()
|
|
|
|
row = layout.row(align=True)
|
|
row.operator("screen.frame_jump", text="", icon='REW').end = False
|
|
row.operator("screen.keyframe_jump", text="", icon='PREV_KEYFRAME').next = False
|
|
if not screen.is_animation_playing:
|
|
# if using JACK and A/V sync:
|
|
# hide the play-reversed button
|
|
# since JACK transport doesn't support reversed playback
|
|
if scene.sync_mode == 'AUDIO_SYNC' and context.user_preferences.system.audio_device == 'JACK':
|
|
sub = row.row(align=True)
|
|
sub.scale_x = 2.0
|
|
sub.operator("screen.animation_play", text="", icon='PLAY')
|
|
else:
|
|
row.operator("screen.animation_play", text="", icon='PLAY_REVERSE').reverse = True
|
|
row.operator("screen.animation_play", text="", icon='PLAY')
|
|
else:
|
|
sub = row.row(align=True)
|
|
sub.scale_x = 2.0
|
|
sub.operator("screen.animation_play", text="", icon='PAUSE')
|
|
row.operator("screen.keyframe_jump", text="", icon='NEXT_KEYFRAME').next = True
|
|
row.operator("screen.frame_jump", text="", icon='FF').end = True
|
|
|
|
layout.prop(scene, "sync_mode", text="")
|
|
|
|
layout.separator()
|
|
|
|
row = layout.row(align=True)
|
|
row.prop(toolsettings, "use_keyframe_insert_auto", text="", toggle=True)
|
|
if toolsettings.use_keyframe_insert_auto:
|
|
row.prop(toolsettings, "use_keyframe_insert_keyingset", text="", toggle=True)
|
|
|
|
if screen.is_animation_playing and not userprefs.edit.use_keyframe_insert_available:
|
|
subsub = row.row(align=True)
|
|
subsub.prop(toolsettings, "use_record_with_nla", toggle=True)
|
|
|
|
layout.prop(toolsettings, "keyframe_type", text="", icon_only=True)
|
|
|
|
row = layout.row(align=True)
|
|
row.prop_search(scene.keying_sets_all, "active", scene, "keying_sets_all", text="")
|
|
row.operator("anim.keyframe_insert", text="", icon='KEY_HLT')
|
|
row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT')
|
|
|
|
|
|
class TIME_MT_editor_menus(Menu):
|
|
bl_idname = "TIME_MT_editor_menus"
|
|
bl_label = ""
|
|
|
|
def draw(self, context):
|
|
self.draw_menus(self.layout, context)
|
|
|
|
@staticmethod
|
|
def draw_menus(layout, context):
|
|
layout.menu("TIME_MT_view")
|
|
layout.menu("TIME_MT_marker")
|
|
layout.menu("TIME_MT_frame")
|
|
layout.menu("TIME_MT_playback")
|
|
|
|
|
|
class TIME_MT_marker(Menu):
|
|
bl_label = "Marker"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
marker_menu_generic(layout)
|
|
|
|
|
|
class TIME_MT_view(Menu):
|
|
bl_label = "View"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
scene = context.scene
|
|
st = context.space_data
|
|
|
|
layout.prop(st, "show_seconds")
|
|
layout.prop(st, "show_locked_time")
|
|
|
|
layout.separator()
|
|
|
|
layout.prop(st, "show_frame_indicator")
|
|
layout.prop(scene, "show_keys_from_selected_only")
|
|
layout.prop(scene, "show_subframe")
|
|
|
|
layout.separator()
|
|
|
|
layout.menu("TIME_MT_cache")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("time.view_all")
|
|
layout.operator("time.view_frame")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("marker.camera_bind")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("screen.area_dupli")
|
|
layout.operator("screen.screen_full_area")
|
|
layout.operator("screen.screen_full_area", text="Toggle Fullscreen Area").use_hide_panels = True
|
|
|
|
|
|
class TIME_MT_cache(Menu):
|
|
bl_label = "Cache"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
st = context.space_data
|
|
|
|
layout.prop(st, "show_cache")
|
|
|
|
layout.separator()
|
|
|
|
col = layout.column()
|
|
col.enabled = st.show_cache
|
|
col.prop(st, "cache_softbody")
|
|
col.prop(st, "cache_particles")
|
|
col.prop(st, "cache_cloth")
|
|
col.prop(st, "cache_smoke")
|
|
col.prop(st, "cache_dynamicpaint")
|
|
col.prop(st, "cache_rigidbody")
|
|
|
|
|
|
class TIME_MT_frame(Menu):
|
|
bl_label = "Frame"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
layout.operator("anim.previewrange_clear")
|
|
layout.operator("anim.previewrange_set")
|
|
layout.separator()
|
|
layout.operator("time.end_frame_set")
|
|
layout.operator("time.start_frame_set")
|
|
|
|
layout.separator()
|
|
|
|
layout.menu("TIME_MT_autokey")
|
|
|
|
|
|
class TIME_MT_playback(Menu):
|
|
bl_label = "Playback"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
screen = context.screen
|
|
scene = context.scene
|
|
|
|
layout.prop(screen, "use_play_top_left_3d_editor")
|
|
layout.prop(screen, "use_play_3d_editors")
|
|
layout.prop(screen, "use_play_animation_editors")
|
|
layout.prop(screen, "use_play_properties_editors")
|
|
layout.prop(screen, "use_play_image_editors")
|
|
layout.prop(screen, "use_play_sequence_editors")
|
|
layout.prop(screen, "use_play_node_editors")
|
|
layout.prop(screen, "use_play_clip_editors")
|
|
|
|
layout.separator()
|
|
layout.prop(screen, "use_follow")
|
|
layout.separator()
|
|
|
|
layout.prop(scene, "use_frame_drop", text="Frame Dropping")
|
|
layout.prop(scene, "use_audio_sync", text="AV-sync", icon='SPEAKER')
|
|
layout.prop(scene, "use_audio")
|
|
layout.prop(scene, "use_audio_scrub")
|
|
|
|
|
|
class TIME_MT_autokey(Menu):
|
|
bl_label = "Auto-Keyframing Mode"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
toolsettings = context.tool_settings
|
|
|
|
layout.prop_enum(toolsettings, "auto_keying_mode", 'ADD_REPLACE_KEYS')
|
|
layout.prop_enum(toolsettings, "auto_keying_mode", 'REPLACE_KEYS')
|
|
|
|
|
|
def marker_menu_generic(layout):
|
|
from bpy import context
|
|
|
|
# layout.operator_context = 'EXEC_REGION_WIN'
|
|
|
|
layout.column()
|
|
layout.operator("marker.add", "Add Marker")
|
|
layout.operator("marker.duplicate", text="Duplicate Marker")
|
|
|
|
if len(bpy.data.scenes) > 10:
|
|
layout.operator_context = 'INVOKE_DEFAULT'
|
|
layout.operator("marker.make_links_scene", text="Duplicate Marker to Scene...", icon='OUTLINER_OB_EMPTY')
|
|
else:
|
|
layout.operator_menu_enum("marker.make_links_scene", "scene", text="Duplicate Marker to Scene")
|
|
|
|
layout.operator("marker.delete", text="Delete Marker")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("marker.rename", text="Rename Marker")
|
|
layout.operator("marker.move", text="Grab/Move Marker")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("screen.marker_jump", text="Jump to Next Marker").next = True
|
|
layout.operator("screen.marker_jump", text="Jump to Previous Marker").next = False
|
|
|
|
layout.separator()
|
|
ts = context.tool_settings
|
|
layout.prop(ts, "lock_markers")
|
|
|
|
|
|
classes = (
|
|
TIME_HT_header,
|
|
TIME_HT_editor_buttons,
|
|
TIME_MT_editor_menus,
|
|
TIME_MT_marker,
|
|
TIME_MT_view,
|
|
TIME_MT_cache,
|
|
TIME_MT_frame,
|
|
TIME_MT_playback,
|
|
TIME_MT_autokey,
|
|
)
|
|
|
|
if __name__ == "__main__": # only for live edit.
|
|
from bpy.utils import register_class
|
|
for cls in classes:
|
|
register_class(cls)
|