diff options
| author | Pablo Vazquez <venomgfx@gmail.com> | 2018-11-05 17:11:18 +0300 |
|---|---|---|
| committer | Pablo Vazquez <venomgfx@gmail.com> | 2018-11-05 17:11:56 +0300 |
| commit | 69fcffb78f24020e4a8b659d49efddf5b9f1f701 (patch) | |
| tree | 70cd2c76079caa1b968c1aaaef6d04980c263842 /release | |
| parent | 7c7c8f34925aad3180ff0626f4162aec135a0a5d (diff) | |
UI: Move Sync Markers from View to Marker menu.
In Dopesheet and Sequencer. Suggested by tintwotin in DevTalk, thanks!
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index bc1940782bd..5ef42dcd129 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -338,7 +338,6 @@ class DOPESHEET_MT_view(Menu): layout.prop(st, "show_interpolation") layout.prop(st, "show_extremes") layout.prop(st, "use_auto_merge_keyframes") - layout.prop(st, "use_marker_sync") layout.prop(st, "show_seconds") layout.prop(st, "show_locked_time") @@ -416,6 +415,7 @@ class DOPESHEET_MT_marker(Menu): if st.show_pose_markers is False: layout.operator("action.markers_make_local") + layout.prop(st, "use_marker_sync") ####################################### # Keyframe Editing diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 5202d28d7ce..f26da21293f 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -225,10 +225,6 @@ class SEQUENCER_MT_view(Menu): layout.separator() - if is_sequencer_view: - layout.prop(st, "use_marker_sync") - layout.separator() - layout.operator("render.opengl", text="OpenGL Render", icon='RENDER_STILL').sequencer = True props = layout.operator("render.opengl", text="OpenGL Render Animation", icon='RENDER_ANIMATION') props.animation = True @@ -275,9 +271,14 @@ class SEQUENCER_MT_marker(Menu): def draw(self, context): layout = self.layout + st = context.space_data + is_sequencer_view = st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'} + from .space_time import marker_menu_generic marker_menu_generic(layout) + if is_sequencer_view: + layout.prop(st, "use_marker_sync") class SEQUENCER_MT_frame(Menu): bl_label = "Frame" |