[Bf-blender-cvs] [69fcffb78f2] blender2.8: UI: Move Sync Markers from View to Marker menu.
Pablo Vazquez
noreply at git.blender.org
Mon Nov 5 15:12:32 CET 2018
Commit: 69fcffb78f24020e4a8b659d49efddf5b9f1f701
Author: Pablo Vazquez
Date: Mon Nov 5 15:11:18 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB69fcffb78f24020e4a8b659d49efddf5b9f1f701
UI: Move Sync Markers from View to Marker menu.
In Dopesheet and Sequencer. Suggested by tintwotin in DevTalk, thanks!
===================================================================
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
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"
More information about the Bf-blender-cvs
mailing list