Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2017-01-26 17:02:28 +01:00
parent 290e080db4 fd69ba2255
commit 9e48cafd6d
42 changed files with 350 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/startup/bl_ui/space_outliner.py
View File

@@ -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()

6
release/scripts/startup/bl_ui/space_sequencer.py
View File

@@ -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