code cleanup: unnecessary shadowing and some minor pep8 edits.

3 files changed, 6 insertions, 7 deletions

diff --git a/release/scripts/startup/bl_operators/add_mesh_torus.py b/release/scripts/startup/bl_operators/add_mesh_torus.py
index fcb9feab192..aa01e20fc97 100644
--- a/release/scripts/startup/bl_operators/add_mesh_torus.py
+++ b/release/scripts/startup/bl_operators/add_mesh_torus.py
@@ -106,9 +106,9 @@ class AddTorus(Operator, object_utils.AddObjectHelper):
             )
     mode = bpy.props.EnumProperty(
             name="Torus Dimensions",
-            items=(("MAJOR_MINOR", "Major/Minor", 
+            items=(("MAJOR_MINOR", "Major/Minor",
                     "Use the major/minor radii for torus dimensions"),
-                   ("EXT_INT", "Exterior/Interior", 
+                   ("EXT_INT", "Exterior/Interior",
                     "Use the exterior/interior radii for torus dimensions")),
             update=mode_update_callback,
             )
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index b1ee7266a10..2ede23325a6 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2614,7 +2614,7 @@ class VIEW3D_PT_view3d_shading(Panel):
     bl_region_type = 'UI'
     bl_label = "Shading"
     bl_options = {'DEFAULT_CLOSED'}
-    
+
     @classmethod
     def poll(cls, context):
         view = context.space_data
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index c40b9807f20..d01df810307 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -913,7 +913,7 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel):
                     row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
                     row.prop(brush, "jitter_absolute")
                 row.prop(brush, "use_pressure_jitter", toggle=True, text="")
-                
+
             if brush.sculpt_capabilities.has_smooth_stroke:
                 col = layout.column()
                 col.separator()
@@ -945,9 +945,8 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel):
             sub.active = brush.use_smooth_stroke
             sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
             sub.prop(brush, "smooth_stroke_factor", text="Factor", slider=True)
-        
-        layout.prop(settings, "input_samples")
 
+        layout.prop(settings, "input_samples")
 
 
 class VIEW3D_PT_tools_brush_curve(Panel, View3DPaintPanel):
@@ -1217,7 +1216,7 @@ class VIEW3D_PT_tools_projectpaint(View3DPanel, Panel):
 
         row = layout.row()
         row.prop(ipaint, "use_normal_falloff")
-        
+
         sub = row.row()
         sub.active = (ipaint.use_normal_falloff)
         sub.prop(ipaint, "normal_angle", text="")