diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-26 19:02:28 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-26 19:02:28 +0300 |
commit | 9e48cafd6d6a3512a41e98e71d957923fbf3cb1d (patch) | |
tree | 1431c8a1fd6e834059d4aa1f063620a036feba46 /release | |
parent | 290e080db40e746416d2f70d28cb906ceb4c4723 (diff) | |
parent | fd69ba225540cde5e4c1fa651fb02df21ea0a143 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_outliner.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 708db2eec8d..6f7c535fe21 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -93,7 +93,8 @@ class OUTLINER_MT_view(Menu): layout.separator() layout.operator("outliner.show_active") - layout.operator("outliner.show_one_level") + layout.operator("outliner.show_one_level", text="Show One Level") + layout.operator("outliner.show_one_level", text="Hide One Level").open = False layout.operator("outliner.show_hierarchy") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 0648db3746d..6bb516cf929 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -435,15 +435,9 @@ class SEQUENCER_MT_strip(Menu): layout.operator("sequencer.crossfade_sounds") layout.separator() - layout.operator("sequencer.meta_make") layout.operator("sequencer.meta_separate") - #if (ed && (ed->metastack.first || (ed->act_seq && ed->act_seq->type == SEQ_META))) { - # uiItemS(layout); - # uiItemO(layout, NULL, 0, "sequencer.meta_toggle"); - #} - layout.separator() layout.operator("sequencer.reload", text="Reload Strips") layout.operator("sequencer.reload", text="Reload Strips and Adjust Length").adjust_length = True |