Merge branch 'master' into blender2.8
[blender.git] / release / scripts / startup / bl_ui / space_sequencer.py
index 199b1f98fa916134644efbc0cfa42bb6def01116..adac167a06d5d1d333898cd7c51cfe21d7dabf67 100644 (file)
@@ -121,14 +121,14 @@ class SEQUENCER_HT_header(Header):
 
         if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}:
             gpd = context.gpencil_data
-            toolsettings = context.tool_settings
+            tool_settings = context.tool_settings
 
             # Proportional editing
             if gpd and gpd.use_stroke_edit_mode:
                 row = layout.row(align=True)
-                row.prop(toolsettings, "proportional_edit", icon_only=True)
-                if toolsettings.proportional_edit != 'DISABLED':
-                    row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
+                row.prop(tool_settings, "proportional_edit", icon_only=True)
+                if tool_settings.proportional_edit != 'DISABLED':
+                    row.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
 
 
 class SEQUENCER_MT_editor_menus(Menu):