diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-20 17:45:29 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-20 17:45:29 +0300 |
| commit | aae0598aa233d43d0ffc81a070b2ce20d6871c1d (patch) | |
| tree | 378100f45cf1db972c671a6886496a5604f7ab29 /release/scripts/startup/bl_ui/space_time.py | |
| parent | 95d7d3c2a6aa91f1dcb33ff0cdfc751e2886d8cd (diff) | |
| parent | d7e4f920fd93a4ae5679e0eb6b228a349ab3b082 (diff) | |
Merge branch 'master' into temp_depsgraph_split_ubereval
Diffstat (limited to 'release/scripts/startup/bl_ui/space_time.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_time.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 817c28c6359..5b0075b4147 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -87,6 +87,8 @@ class TIME_HT_header(Header): subsub = row.row(align=True) subsub.prop(toolsettings, "use_record_with_nla", toggle=True) + layout.prop(toolsettings, "keyframe_type", text="", icon_only=True) + row = layout.row(align=True) row.prop_search(scene.keying_sets_all, "active", scene, "keying_sets_all", text="") row.operator("anim.keyframe_insert", text="", icon='KEY_HLT') @@ -128,7 +130,6 @@ class TIME_MT_view(Menu): layout.prop(st, "show_seconds") layout.prop(st, "show_locked_time") - layout.operator("time.view_all") layout.separator() @@ -141,6 +142,11 @@ class TIME_MT_view(Menu): layout.separator() + layout.operator("time.view_all") + layout.operator("time.view_frame") + + layout.separator() + layout.operator("marker.camera_bind") layout.separator() |