Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-06-05 17:35:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-05 17:36:13 +0300
commit7436fb2ef1d8bb0af0589f8ec4b45c8800aed983 (patch)
treee99050b05bf97b20cc0f5c05ea549aa31d8fba09 /release/scripts/startup/bl_ui/space_time.py
parentd94df18550702a9df7b56feb5d58fb20effb7536 (diff)
parentc68429bc038635a6c2a3f29a5b057c077be3a4b0 (diff)
Merge branch 'master' into 28
Diffstat (limited to 'release/scripts/startup/bl_ui/space_time.py')
-rw-r--r--release/scripts/startup/bl_ui/space_time.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index d5609e219e3..7c584b3177b 100644
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -117,6 +117,7 @@ class TIME_MT_editor_menus(Menu):
panel_type="TIME_PT_keyframing_settings",
text="Keying")
+
class TIME_MT_marker(Menu):
bl_label = "Marker"
@@ -217,6 +218,7 @@ def marker_menu_generic(layout):
###################################
+
class TimelinePanelButtons:
bl_space_type = 'DOPESHEET_EDITOR'
bl_region_type = 'UI'