diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-01-26 21:17:22 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-01-26 21:17:22 +0300 |
| commit | c1742b88a4cf58e474b3dfe9d01921105b8c8b6e (patch) | |
| tree | 1147fc9d41c9200f9f591d6dd26720af4f1225b3 /release | |
| parent | 8f673cb40c6d038ecaabd24c6549dc5c7571c26a (diff) | |
| parent | 8d04f49d0ea53552500e82afea92addaaa939dfd (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into render-layers
Note:
renamed blo_do_versions_after_linking_280 to do_versions_after_linking_280 to following the pattern of do_versions_after_linking_270
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 |