Merge branch 'blender-v2.93-release'

This commit is contained in:
Alexander Gavrilov 2021-05-10 14:16:38 +03:00
commit bc868f7b52
1 changed files with 2 additions and 2 deletions

View File

@ -300,6 +300,8 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel):
col.label(text="New Keyframe Type")
col.prop(tool_settings, "keyframe_type", text="")
layout.prop(tool_settings, "use_keyframe_cycle_aware")
class TIME_PT_auto_keyframing(TimelinePanelButtons, Panel):
bl_label = "Auto Keyframing"
@ -327,8 +329,6 @@ class TIME_PT_auto_keyframing(TimelinePanelButtons, Panel):
if not prefs.edit.use_keyframe_insert_available:
col.prop(tool_settings, "use_record_with_nla", text="Layered Recording")
col.prop(tool_settings, "use_keyframe_cycle_aware")
###################################