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:
Campbell Barton
2018-06-26 22:56:39 +02:00
parent a3cd57ea8c 532c8ac583
commit a61480c271
68 changed files with 1554 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
release/scripts/startup/bl_ui/space_time.py
View File

@@ -91,14 +91,18 @@ class TIME_MT_editor_menus(Menu):
@staticmethod
def draw_menus(layout, context):
layout.popover(space_type='DOPESHEET_EDITOR',
region_type='HEADER',
panel_type="TIME_PT_playback",
text="Playback")
layout.popover(space_type='DOPESHEET_EDITOR',
region_type='HEADER',
panel_type="TIME_PT_keyframing_settings",
text="Keying")
layout.popover(
space_type='DOPESHEET_EDITOR',
region_type='HEADER',
panel_type="TIME_PT_playback",
text="Playback",
)
layout.popover(
space_type='DOPESHEET_EDITOR',
region_type='HEADER',
panel_type="TIME_PT_keyframing_settings",
text="Keying",
)
layout.menu("TIME_MT_view")
layout.menu("TIME_MT_marker")