Merge branch 'master' into blender2.8
[blender.git] / release / scripts / startup / bl_ui / space_dopesheet.py
index b57a0b69539436a335055d8a5de9421da85d954a..f35dea678549f190dcd92994ce74282c33158911 100644 (file)
@@ -237,7 +237,7 @@ class DOPESHEET_HT_editor_buttons(Header):
     @staticmethod
     def draw_header(context, layout):
         st = context.space_data
-        toolsettings = context.tool_settings
+        tool_settings = context.tool_settings
 
         if st.mode in {'ACTION', 'SHAPEKEY'}:
             # TODO: These buttons need some tidying up - Probably by using a popover, and bypassing the template_id() here
@@ -284,10 +284,10 @@ class DOPESHEET_HT_editor_buttons(Header):
             layout.prop(st, "auto_snap", text="")
 
         row = layout.row(align=True)
-        row.prop(toolsettings, "use_proportional_action", text="", icon_only=True)
+        row.prop(tool_settings, "use_proportional_action", text="", icon_only=True)
         sub = row.row(align=True)
-        sub.active = toolsettings.use_proportional_action
-        sub.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
+        sub.active = tool_settings.use_proportional_action
+        sub.prop(tool_settings, "proportional_edit_falloff", text="", icon_only=True)
 
 
 class DOPESHEET_MT_editor_menus(Menu):