Merge branch 'master' into blender2.8

1 files changed, 10 insertions, 10 deletions

diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index 79c0c5264e1..47c8381001e 100644
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -33,12 +33,12 @@ class TIME_HT_editor_buttons(Header):
     @staticmethod
     def draw_header(context, layout):
         scene = context.scene
-        toolsettings = context.tool_settings
+        tool_settings = context.tool_settings
         screen = context.screen
 
         layout.separator_spacer()
 
-        layout.prop(toolsettings, "use_keyframe_insert_auto", text="", toggle=True)
+        layout.prop(tool_settings, "use_keyframe_insert_auto", text="", toggle=True)
 
         row = layout.row(align=True)
         row.operator("screen.frame_jump", text="", icon='REW').end = False
@@ -208,8 +208,8 @@ def marker_menu_generic(layout):
     layout.operator("screen.marker_jump", text="Jump to Previous Marker").next = False
 
     layout.separator()
-    ts = context.tool_settings
-    layout.prop(ts, "lock_markers")
+    tool_settings = context.tool_settings
+    layout.prop(tool_settings, "lock_markers")
 
 ###################################
 
@@ -276,7 +276,7 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel):
         layout = self.layout
 
         scene = context.scene
-        toolsettings = context.tool_settings
+        tool_settings = context.tool_settings
         userprefs = context.user_preferences
 
         col = layout.column(align=True)
@@ -288,17 +288,17 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel):
 
         col = layout.column(align=True)
         col.label(text="New Keyframe Type:")
-        col.prop(toolsettings, "keyframe_type", text="")
+        col.prop(tool_settings, "keyframe_type", text="")
 
         col = layout.column(align=True)
         col.label(text="Auto Keyframing:")
         row = col.row()
-        row.prop(toolsettings, "auto_keying_mode", text="")
-        row.prop(toolsettings, "use_keyframe_insert_keyingset", text="")
+        row.prop(tool_settings, "auto_keying_mode", text="")
+        row.prop(tool_settings, "use_keyframe_insert_keyingset", text="")
         if not userprefs.edit.use_keyframe_insert_available:
-            col.prop(toolsettings, "use_record_with_nla", text="Layered Recording")
+            col.prop(tool_settings, "use_record_with_nla", text="Layered Recording")
 
-        layout.prop(toolsettings, "use_keyframe_cycle_aware")
+        layout.prop(tool_settings, "use_keyframe_cycle_aware")
 
 
 ###################################