diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
| commit | a35c635edb3db548e11555024ec3a384f93ce352 (patch) | |
| tree | ae0c0c9435c2e7daed4cbd916e0be90df7898b51 /release/scripts/startup/bl_ui/space_nla.py | |
| parent | 7164e63fefcfa26caf387a2ad04a8c51b533c32b (diff) | |
| parent | f1ac64921b49eaea8658d144754a1a532198c720 (diff) | |
Merge branch 'master' into tmp-overlay-enginetmp-overlay-engine
# Conflicts:
# source/blender/draw/modes/paint_texture_mode.c
Diffstat (limited to 'release/scripts/startup/bl_ui/space_nla.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_nla.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index 825e4b41609..24d6f65d9b9 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -71,10 +71,12 @@ class NLA_MT_editor_menus(Menu): bl_label = "" def draw(self, _context): + st = _context.space_data layout = self.layout layout.menu("NLA_MT_view") layout.menu("NLA_MT_select") - layout.menu("NLA_MT_marker") + if st.show_markers: + layout.menu("NLA_MT_marker") layout.menu("NLA_MT_edit") layout.menu("NLA_MT_add") @@ -96,8 +98,10 @@ class NLA_MT_view(Menu): layout.prop(st, "show_locked_time") layout.prop(st, "show_strip_curves") + + layout.separator() + layout.prop(st, "show_markers") layout.prop(st, "show_local_markers") - layout.prop(st, "show_marker_lines") layout.separator() layout.operator("anim.previewrange_set") |