diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:06:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:06:14 +0300 |
| commit | 5b643018348280ee601a20fb9329d5a313c23446 (patch) | |
| tree | b2bb37028ac88a655aea37bb7a8b850b84885cea /release/scripts/startup/bl_ui/space_time.py | |
| parent | f6743fcaa4fbccd4bd8a92c44a3cd4bd2d153fd1 (diff) | |
| parent | 2d3d76693a84224b86eac50729fb5a321753b7e3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_time.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_time.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 48ac85f0d0e..d5609e219e3 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -292,7 +292,7 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel): col = layout.column(align=True) col.label("New Keyframe Type:") col.prop(toolsettings, "keyframe_type", text="") - + col = layout.column(align=True) col.label("Auto Keyframing:") row = col.row() |