used py error checking tools to fix some bugs & make pep8 corrections

diff --git a/release/scripts/ui/properties_data_armature.py b/release/scripts/ui/properties_data_armature.py
index a433ca5ccb3f00e5e49c0627ed0f7144c4de3e25..1f75c7658e3dd698165bd94079521965fab1ce83 100644 (file)
--- a/release/scripts/ui/properties_data_armature.py
+++ b/release/scripts/ui/properties_data_armature.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class DataButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -41,7 +42,7 @@ class DATA_PT_context_arm(DataButtonsPanel):
         arm = context.armature
         space = context.space_data
         col2 = context.region.width > narrowui
-        
+
         if col2:
             split = layout.split(percentage=0.65)
             if ob:
@@ -60,9 +61,7 @@ class DATA_PT_skeleton(DataButtonsPanel):
     def draw(self, context):
         layout = self.layout
 
-        ob = context.object
         arm = context.armature
-        space = context.space_data
         col2 = context.region.width > narrowui
 
         layout.itemR(arm, "pose_position", expand=True)
@@ -104,7 +103,7 @@ class DATA_PT_display(DataButtonsPanel):
         col.itemR(arm, "draw_names", text="Names")
         col.itemR(arm, "draw_axes", text="Axes")
         col.itemR(arm, "draw_custom_bone_shapes", text="Shapes")
-        
+
         if col2:
             col = split.column()
         col.itemR(arm, "draw_group_colors", text="Colors")
@@ -140,7 +139,7 @@ class DATA_PT_bone_groups(DataButtonsPanel):
 
             split = layout.split()
             split.active = (ob.proxy == None)
-            
+
             col = split.column()
             col.itemR(group, "color_set")
             if group.color_set:
@@ -198,7 +197,7 @@ class DATA_PT_paths(DataButtonsPanel):
 
         col = split.column()
         col.itemO("pose.paths_calculate", text="Calculate Paths")
-        
+
         if col2:
             col = split.column()
         col.itemO("pose.paths_clear", text="Clear Paths")

diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/ui/properties_data_bone.py
index 042a2e40a15bf7f654deae61cb64eb134360241d..c670d4677d824fec0b2f52911385d7c43790ad4a 100644 (file)
--- a/release/scripts/ui/properties_data_bone.py
+++ b/release/scripts/ui/properties_data_bone.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class BoneButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -55,14 +56,14 @@ class BONE_PT_transform(BoneButtonsPanel):
         ob = context.object
         bone = context.bone
         col2 = context.region.width > narrowui
-        
+
         if not bone:
             bone = context.edit_bone
             if col2:
                 row = layout.row()
                 row.column().itemR(bone, "head")
                 row.column().itemR(bone, "tail")
-    
+
                 col = row.column()
                 sub = col.column(align=True)
                 sub.itemL(text="Roll:")
@@ -78,13 +79,13 @@ class BONE_PT_transform(BoneButtonsPanel):
 
         else:
             pchan = ob.pose.pose_channels[context.bone.name]
-            
+
             if col2:
                 row = layout.row()
                 col = row.column()
                 col.itemR(pchan, "location")
                 col.active = not (bone.parent and bone.connected)
-    
+
                 col = row.column()
                 if pchan.rotation_mode == 'QUATERNION':
                     col.itemR(pchan, "rotation_quaternion", text="Rotation")
@@ -95,9 +96,9 @@ class BONE_PT_transform(BoneButtonsPanel):
                     col.itemR(pchan, "rotation_axis_angle", text="Rotation")
                 else:
                     col.itemR(pchan, "rotation_euler", text="Rotation")
-    
+
                 row.column().itemR(pchan, "scale")
-    
+
                 layout.itemR(pchan, "rotation_mode")
             else:
                 col = layout.column()
@@ -201,7 +202,6 @@ class BONE_PT_display(BoneButtonsPanel):
 
         ob = context.object
         bone = context.bone
-        arm = context.armature
         col2 = context.region.width > narrowui
 
         if not bone:

diff --git a/release/scripts/ui/properties_data_camera.py b/release/scripts/ui/properties_data_camera.py
index 50bc3ab49a382e7e082ce0ed6533b79e6abae2d0..e3db1e6af4167d6e9fea15bd26014e6da4e21dc1 100644 (file)
--- a/release/scripts/ui/properties_data_camera.py
+++ b/release/scripts/ui/properties_data_camera.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class DataButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -44,7 +45,7 @@ class DATA_PT_context_camera(DataButtonsPanel):
 
         if col2:
             split = layout.split(percentage=0.65)
-    
+
             if ob:
                 split.template_ID(ob, "data")
                 split.itemS()
@@ -70,7 +71,7 @@ class DATA_PT_camera(DataButtonsPanel):
             layout.itemR(cam, "type", text="")
 
         split = layout.split()
-        
+
         col = split.column()
         if cam.type == 'PERSP':
             if cam.lens_unit == 'MILLIMETERS':
@@ -82,7 +83,7 @@ class DATA_PT_camera(DataButtonsPanel):
             col.itemR(cam, "lens_unit", text="")
 
         elif cam.type == 'ORTHO':
-            row.itemR(cam, "ortho_scale")
+            col.itemR(cam, "ortho_scale")
 
         layout.itemR(cam, "panorama")
 
@@ -105,7 +106,7 @@ class DATA_PT_camera(DataButtonsPanel):
 
         col = split.column()
         col.itemR(cam, "dof_object", text="")
-        
+
         if col2:
             col = split.column()
         col.itemR(cam, "dof_distance", text="Distance")

diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/ui/properties_data_curve.py
index f1f747721a1a4493ab64f94b9413166b1c1d39a8..a7fb6a615d49697b6cb1dd648adc5b65bc50c18d 100644 (file)
--- a/release/scripts/ui/properties_data_curve.py
+++ b/release/scripts/ui/properties_data_curve.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class DataButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -57,7 +58,7 @@ class DATA_PT_context_curve(DataButtonsPanel):
         space = context.space_data
         col2 = context.region.width > narrowui
 
-        
+
         if col2:
             split = layout.split(percentage=0.65)
 
@@ -70,6 +71,7 @@ class DATA_PT_context_curve(DataButtonsPanel):
         else:
             layout.template_ID(ob, "data")
 
+
 class DATA_PT_shape_curve(DataButtonsPanel):
     bl_label = "Shape"
 
@@ -78,7 +80,6 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 
         ob = context.object
         curve = context.curve
-        space = context.space_data
         col2 = context.region.width > narrowui
         is_surf = (ob.type == 'SURFACE')
 
@@ -119,7 +120,7 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 
         col = split.column()
         col.itemR(curve, "twist_mode", text="Twist")
-        
+
         if col2:
             col = split.column()
         col.itemR(curve, "twist_smooth") # XXX - may not be kept

diff --git a/release/scripts/ui/properties_data_empty.py b/release/scripts/ui/properties_data_empty.py
index 225247dbc0758ba83b3885bb889985240ffe9f60..6963710a61feb6de6657569316f89075fd5c1897 100644 (file)
--- a/release/scripts/ui/properties_data_empty.py
+++ b/release/scripts/ui/properties_data_empty.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class DataButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'

diff --git a/release/scripts/ui/properties_data_lamp.py b/release/scripts/ui/properties_data_lamp.py
index d13d75da746c89aa8061f09050702906cd6be8c0..bb1bb4ca146ba3dc4f2772a3c07be1c40f50da27 100644 (file)
--- a/release/scripts/ui/properties_data_lamp.py
+++ b/release/scripts/ui/properties_data_lamp.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class DataButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -229,7 +230,7 @@ class DATA_PT_shadow(DataButtonsPanel):
                 split = layout.split()
 
                 col = split.column()
-                
+
                 if lamp.shape == 'SQUARE':
                     col.itemR(lamp, "shadow_ray_samples_x", text="Samples")
                 elif lamp.shape == 'RECTANGLE':
@@ -250,7 +251,7 @@ class DATA_PT_shadow(DataButtonsPanel):
                 else:
                     if col2:
                         col = split.column()
-                
+
 
         elif lamp.shadow_method == 'BUFFER_SHADOW':
             col = layout.column()

diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py
index e39b8fd49ee4a43a21cf77b899d766a7b8e41fa8..74fce28961245e5a0cb1fe0e90eddb9f3baf7215 100644 (file)
--- a/release/scripts/ui/properties_data_mesh.py
+++ b/release/scripts/ui/properties_data_mesh.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class DataButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -184,12 +185,12 @@ class DATA_PT_shape_keys(DataButtonsPanel):
 
             row = split.row()
             row.alignment = 'RIGHT'
-            
+
             if not col2:
                 layout.itemR(key, "relative")
                 row = layout.row()
-                
-            
+
+
             sub = row.row(align=True)
             subsub = sub.row(align=True)
             subsub.active = enable_edit_value

diff --git a/release/scripts/ui/properties_data_text.py b/release/scripts/ui/properties_data_text.py
index b622264569fae8b7124191de5a989e0783678723..0aee1308beabd00d536f315ced64c8da9d111d19 100644 (file)
--- a/release/scripts/ui/properties_data_text.py
+++ b/release/scripts/ui/properties_data_text.py
@@ -56,9 +56,7 @@ class DATA_PT_shape_text(DataButtonsPanel):
     def draw(self, context):
         layout = self.layout
 
-        ob = context.object
         curve = context.curve
-        space = context.space_data
 
         split = layout.split()
 

diff --git a/release/scripts/ui/properties_material.py b/release/scripts/ui/properties_material.py
index 8cdc53a50946b0ce1631b424c6d653cd64f0ca1f..8a9a40f2b12f090badccbef59221d49504caa92b 100644 (file)
--- a/release/scripts/ui/properties_material.py
+++ b/release/scripts/ui/properties_material.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 def active_node_mat(mat):
     # TODO, 2.4x has a pipeline section, for 2.5 we need to communicate
     # which settings from node-materials are used
@@ -93,7 +94,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
 
         if col2:
             split = layout.split(percentage=0.65)
-    
+
             if ob:
                 split.template_ID(ob, "active_material", new="material.new")
                 row = split.row()
@@ -112,7 +113,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
                 layout.itemR(mat, "type", expand=True)
             else:
                 layout.itemR(mat, "type", text="")
-                
+
 
 class MATERIAL_PT_shading(MaterialButtonsPanel):
     bl_label = "Shading"
@@ -210,7 +211,7 @@ class MATERIAL_PT_physics(MaterialButtonsPanel):
 
         phys = context.material.physics # dont use node material
         col2 = context.region.width > narrowui
-        
+
         split = layout.split()
 
         col = split.column()
@@ -344,19 +345,19 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
             col.itemR(mat, "darkness")
         elif mat.diffuse_shader == 'TOON':
             split = col.split()
-            
+
             col = split.column()
             col.itemR(mat, "diffuse_toon_size", text="Size")
-            
+
             if col2:
                 col = split.column()
             col.itemR(mat, "diffuse_toon_smooth", text="Smooth")
         elif mat.diffuse_shader == 'FRESNEL':
             split = col.split()
-            
+
             col = split.column()
             col.itemR(mat, "diffuse_fresnel", text="Fresnel")
-            
+
             if col2:
                 col = split.column()
             col.itemR(mat, "diffuse_fresnel_factor", text="Factor")
@@ -365,12 +366,12 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
             layout.itemS()
             layout.template_color_ramp(mat, "diffuse_ramp", expand=True)
             layout.itemS()
-            
+
             split = layout.split()
-            
+
             col = split.column()
             col.itemR(mat, "diffuse_ramp_input", text="Input")
-            
+
             if col2:
                 col = split.column()
             col.itemR(mat, "diffuse_ramp_blend", text="Blend")
@@ -411,10 +412,10 @@ class MATERIAL_PT_specular(MaterialButtonsPanel):
             col.itemR(mat, "specular_hardness", text="Hardness")
         elif mat.specular_shader == 'BLINN':
             split = layout.split()
-            
+
             col = split.column()
             col.itemR(mat, "specular_hardness", text="Hardness")
-            
+
             if col2:
                 col = split.column()
             col.itemR(mat, "specular_ior", text="IOR")
@@ -422,10 +423,10 @@ class MATERIAL_PT_specular(MaterialButtonsPanel):
             col.itemR(mat, "specular_slope", text="Slope")
         elif mat.specular_shader == 'TOON':
             split = layout.split()
-            
+
             col = split.column()
             col.itemR(mat, "specular_toon_size", text="Size")
-            
+
             if col2:
                 col = split.column()
             col.itemR(mat, "specular_toon_smooth", text="Smooth")
@@ -435,14 +436,14 @@ class MATERIAL_PT_specular(MaterialButtonsPanel):
             layout.template_color_ramp(mat, "specular_ramp", expand=True)
             layout.itemS()
             split = layout.split()
-            
+
             col = split.column()
             col.itemR(mat, "specular_ramp_input", text="Input")
-            
+
             if col2:
                 col = split.column()
             col.itemR(mat, "specular_ramp_blend", text="Blend")
-            
+
             row = layout.row()
             row.itemR(mat, "specular_ramp_factor", text="Factor")
 
@@ -746,7 +747,7 @@ class MATERIAL_PT_volume_density(VolumeButtonsPanel):
         split = layout.split()
         col = split.column()
         col.itemR(vol, "density")
-        
+
         if col2:
             col = split.column()
         col.itemR(vol, "density_scale")

diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py
index bb2e2f43599241dee49462142885bf9565d419f7..45a9318afd388411bbaf38b6804d31a8e2e40995 100644 (file)
--- a/release/scripts/ui/properties_object.py
+++ b/release/scripts/ui/properties_object.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class ObjectButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -52,7 +53,7 @@ class OBJECT_PT_transform(ObjectButtonsPanel):
 
         if col2:
             row = layout.row()
-            
+
             row.column().itemR(ob, "location")
             if ob.rotation_mode == 'QUATERNION':
                 row.column().itemR(ob, "rotation_quaternion", text="Rotation")
@@ -63,9 +64,9 @@ class OBJECT_PT_transform(ObjectButtonsPanel):
                 row.column().itemR(ob, "rotation_axis_angle", text="Rotation")
             else:
                 row.column().itemR(ob, "rotation_euler", text="Rotation")
-    
+
             row.column().itemR(ob, "scale")
-    
+
             layout.itemR(ob, "rotation_mode")
         else:
             col = layout.column()
@@ -89,7 +90,7 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel):
         layout = self.layout
 
         ob = context.object
-        col2 = context.region.width > narrowui
+        # col2 = context.region.width > narrowui
 
         row = layout.row()
 
@@ -145,7 +146,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel):
 
         ob = context.object
         col2 = context.region.width > narrowui
-        
+
         if col2:
             split = layout.split()
             split.item_menu_enumO("object.group_add", "group", text="Add to Group")
@@ -164,10 +165,10 @@ class OBJECT_PT_groups(ObjectButtonsPanel):
                 row.itemO("object.group_remove", text="", icon='VICON_X')
 
                 split = col.box().split()
-                
+
                 col = split.column()
                 col.itemR(group, "layer", text="Dupli")
-                
+
                 if col2:
                     col = split.column()
                 col.itemR(group, "dupli_offset", text="")
@@ -181,11 +182,11 @@ class OBJECT_PT_display(ObjectButtonsPanel):
 
         ob = context.object
         col2 = context.region.width > narrowui
-        
+
         split = layout.split()
         col = split.column()
         col.itemR(ob, "max_draw_type", text="Type")
-        
+
         if col2:
             col = split.column()
         row = col.row()
@@ -195,12 +196,12 @@ class OBJECT_PT_display(ObjectButtonsPanel):
         sub.itemR(ob, "draw_bounds_type", text="")
 
         split = layout.split()
-        
+
         col = split.column()
         col.itemR(ob, "draw_name", text="Name")
         col.itemR(ob, "draw_axis", text="Axis")
         col.itemR(ob, "draw_wire", text="Wire")
-        
+
         if col2:
             col = split.column()
         col.itemR(ob, "draw_texture_space", text="Texture Space")
@@ -216,12 +217,12 @@ class OBJECT_PT_duplication(ObjectButtonsPanel):
 
         ob = context.object
         col2 = context.region.width > narrowui
-        
+
         if col2:
             layout.itemR(ob, "dupli_type", expand=True)
         else:
             layout.itemR(ob, "dupli_type", text="")
-        
+
         if ob.dupli_type == 'FRAMES':
             split = layout.split()
 
@@ -244,7 +245,7 @@ class OBJECT_PT_duplication(ObjectButtonsPanel):
 
             col = split.column()
             col.itemR(ob, "dupli_faces_scale", text="Scale")
-            
+
             if col2:
                 col = split.column()
             col.itemR(ob, "dupli_faces_inherit_scale", text="Inherit Scale")
@@ -264,7 +265,7 @@ class OBJECT_PT_animation(ObjectButtonsPanel):
 
         ob = context.object
         col2 = context.region.width > narrowui
-        
+
         split = layout.split()
 
         col = split.column()

diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py
index 6b2dfceb6c34206e24dc1deec59e470cbb0208ba..9e6b018d33d0f3490c3b2629cfaa45ccc4133f3f 100644 (file)
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -208,7 +208,7 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel):
         layout = self.layout
 
         psys = context.particle_system
-        part = psys.settings
+        #part = psys.settings
         cloth = psys.cloth.settings
 
         layout.enabled = psys.hair_dynamics
@@ -250,7 +250,6 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
         return psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.hair_dynamics)
 
     def draw(self, context):
-        layout = self.layout
 
         psys = context.particle_system
 
@@ -932,7 +931,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel):
 
         ob = context.object
         psys = context.particle_system
-        part = psys.settings
+        # part = psys.settings
 
         # layout.itemL(text="Nothing here yet.")
 

diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py
index 187db9940f98b679868bb2bb11a60d24fbffc183..349399bf724c592dfcf812cee257a994d52ca53e 100644 (file)
--- a/release/scripts/ui/properties_physics_common.py
+++ b/release/scripts/ui/properties_physics_common.py
@@ -17,7 +17,6 @@
 # ##### END GPL LICENSE BLOCK #####
 
 # <pep8 compliant>
-import bpy
 
 
 def point_cache_ui(self, cache, enabled, particles, smoke):
@@ -88,29 +87,29 @@ def point_cache_ui(self, cache, enabled, particles, smoke):
 
 
 def effector_weights_ui(self, weights):
-        layout = self.layout
-
-        layout.itemR(weights, "group")
+    layout = self.layout
 
-        split = layout.split()
-        split.itemR(weights, "gravity", slider=True)
-        split.itemR(weights, "all", slider=True)
+    layout.itemR(weights, "group")
 
-        layout.itemS()
-
-        flow = layout.column_flow()
-        flow.itemR(weights, "force", slider=True)
-        flow.itemR(weights, "vortex", slider=True)
-        flow.itemR(weights, "magnetic", slider=True)
-        flow.itemR(weights, "wind", slider=True)
-        flow.itemR(weights, "curveguide", slider=True)
-        flow.itemR(weights, "texture", slider=True)
-        flow.itemR(weights, "harmonic", slider=True)
-        flow.itemR(weights, "charge", slider=True)
-        flow.itemR(weights, "lennardjones", slider=True)
-        flow.itemR(weights, "turbulence", slider=True)
-        flow.itemR(weights, "drag", slider=True)
-        flow.itemR(weights, "boid", slider=True)
+    split = layout.split()
+    split.itemR(weights, "gravity", slider=True)
+    split.itemR(weights, "all", slider=True)
+
+    layout.itemS()
+
+    flow = layout.column_flow()
+    flow.itemR(weights, "force", slider=True)
+    flow.itemR(weights, "vortex", slider=True)
+    flow.itemR(weights, "magnetic", slider=True)
+    flow.itemR(weights, "wind", slider=True)
+    flow.itemR(weights, "curveguide", slider=True)
+    flow.itemR(weights, "texture", slider=True)
+    flow.itemR(weights, "harmonic", slider=True)
+    flow.itemR(weights, "charge", slider=True)
+    flow.itemR(weights, "lennardjones", slider=True)
+    flow.itemR(weights, "turbulence", slider=True)
+    flow.itemR(weights, "drag", slider=True)
+    flow.itemR(weights, "boid", slider=True)
 
 
 def basic_force_field_settings_ui(self, field):

diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py
index 47a5546c20521a6fbfb139b0a9ec8f2e721c7b83..1539a13964ca74dd538e42e271242285bbeb7751 100644 (file)
--- a/release/scripts/ui/properties_physics_fluid.py
+++ b/release/scripts/ui/properties_physics_fluid.py
@@ -38,7 +38,6 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel):
         layout = self.layout
 
         md = context.fluid
-        ob = context.object
 
         split = layout.split()
         split.operator_context = 'EXEC_DEFAULT'

diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py
index 3b9b6fdf2b1e65de44cb33f4a8768df0af2cb63e..248e534bc15ac771a41a5142dc69a9b9ffadea02 100644 (file)
--- a/release/scripts/ui/properties_physics_smoke.py
+++ b/release/scripts/ui/properties_physics_smoke.py
@@ -143,8 +143,6 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
         return md and (md.smoke_type == 'TYPE_DOMAIN')
 
     def draw(self, context):
-        layout = self.layout
-
         md = context.smoke.domain_settings
         cache = md.point_cache_low
 
@@ -191,8 +189,6 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
         return md and (md.smoke_type == 'TYPE_DOMAIN') and md.domain_settings.highres
 
     def draw(self, context):
-        layout = self.layout
-
         md = context.smoke.domain_settings
         cache = md.point_cache_high
 

diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py
index f43d903d0c778be6f8bbfd0eb98fca348841fded..5014337ec4d46fb8bd0849480933b327f00aff31 100644 (file)
--- a/release/scripts/ui/properties_physics_softbody.py
+++ b/release/scripts/ui/properties_physics_softbody.py
@@ -204,7 +204,6 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel):
 
         md = context.soft_body
         softbody = md.settings
-        ob = context.object
 
         layout.active = softbody.self_collision and softbody_panel_enabled(md)
 
@@ -230,7 +229,6 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel):
 
         md = context.soft_body
         softbody = md.settings
-        ob = context.object
 
         layout.active = softbody_panel_enabled(md)
 

diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py
index b4d69b595bb44e68729043bf253d070a5e68cdeb..5d26f5098f9bf31cef6fda0520a79c22c1cbcd8d 100644 (file)
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -21,19 +21,17 @@ import bpy
 
 narrowui = 180
 
+
 class RenderButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = "render"
     # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
 
-    
-
     def poll(self, context):
         rd = context.scene.render_data
         return (context.scene and rd.use_game_engine == False) and (rd.engine in self.COMPAT_ENGINES)
-   
-    
+
 
 class RENDER_PT_render(RenderButtonsPanel):
     bl_label = "Render"
@@ -44,12 +42,12 @@ class RENDER_PT_render(RenderButtonsPanel):
 
         rd = context.scene.render_data
         col2 = context.region.width > narrowui
-        
+
         split = layout.split()
-        
+
         col = split.column()
         col.itemO("screen.render", text="Image", icon='ICON_RENDER_STILL')
-        
+
         if col2:
             col = split.column()
         col.item_booleanO("screen.render", "animation", True, text="Animation", icon='ICON_RENDER_ANIMATION')
@@ -68,7 +66,7 @@ class RENDER_PT_layers(RenderButtonsPanel):
         scene = context.scene
         rd = scene.render_data
         col2 = context.region.width > narrowui
-        
+
         row = layout.row()
         row.template_list(rd, "layers", rd, "active_layer_index", rows=2)
 
@@ -164,7 +162,7 @@ class RENDER_PT_shading(RenderButtonsPanel):
 
         rd = context.scene.render_data
         col2 = context.region.width > narrowui
-        
+
         split = layout.split()
 
         col = split.column()
@@ -172,7 +170,7 @@ class RENDER_PT_shading(RenderButtonsPanel):
         col.itemR(rd, "render_shadows", text="Shadows")
         col.itemR(rd, "render_sss", text="Subsurface Scattering")
         col.itemR(rd, "render_envmaps", text="Environment Map")
-        
+
         if col2:
             col = split.column()
         col.itemR(rd, "render_raytracing", text="Ray Tracing")
@@ -190,7 +188,7 @@ class RENDER_PT_performance(RenderButtonsPanel):
 
         rd = context.scene.render_data
         col2 = context.region.width > narrowui
-        
+
         split = layout.split()
 
         col = split.column(align=True)
@@ -230,10 +228,10 @@ class RENDER_PT_post_processing(RenderButtonsPanel):
 
     def draw(self, context):
         layout = self.layout
-        
+
         rd = context.scene.render_data
         col2 = context.region.width > narrowui
-        
+
         split = layout.split()
 
         col = split.column()
@@ -273,10 +271,10 @@ class RENDER_PT_output(RenderButtonsPanel):
 
     def draw(self, context):
         layout = self.layout
-        
+
         rd = context.scene.render_data
         col2 = context.region.width > narrowui
-        
+
         layout.itemR(rd, "output_path", text="")
 
         split = layout.split()
@@ -300,13 +298,13 @@ class RENDER_PT_output(RenderButtonsPanel):
             col = split.column()
             col.itemL(text="Codec:")
             col.itemR(rd, "exr_codec", text="")
-            
+
             if col2:
                 subsplit = split.split()
                 col = subsplit.column()
             col.itemR(rd, "exr_half")
             col.itemR(rd, "exr_zbuf")
-            
+
             if col2:
                 col = subsplit.column()
             col.itemR(rd, "exr_preview")
@@ -389,7 +387,7 @@ class RENDER_PT_encoding(RenderButtonsPanel):
         col = split.column()
         col.itemR(rd, "ffmpeg_audio_bitrate")
         col.itemR(rd, "ffmpeg_audio_mixrate")
-        
+
         if col2:
             col = split.column()
         col.itemR(rd, "ffmpeg_multiplex_audio")
@@ -411,7 +409,7 @@ class RENDER_PT_antialiasing(RenderButtonsPanel):
         rd = context.scene.render_data
         col2 = context.region.width > narrowui
         layout.active = rd.antialiasing
-        
+
         split = layout.split()
 
         col = split.column()
@@ -434,7 +432,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel):
         scene = context.scene
         rd = scene.render_data
         col2 = context.region.width > narrowui
-        
+
         split = layout.split()
 
         col = split.column()
@@ -461,7 +459,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel):
         sub.itemR(scene, "start_frame", text="Start")
         sub.itemR(scene, "end_frame", text="End")
         sub.itemR(scene, "frame_step", text="Step")
-        
+
         sub = col.column(align=True)
         sub.itemL(text="Frame Rate:")
         sub.itemR(rd, "fps")

diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py
index 9d557b8f3f1ee9840fa66bed77f74d6e80762f11..b96445dcd904096ed63c3acc94ce9a9c3acb0fe2 100644 (file)
--- a/release/scripts/ui/properties_scene.py
+++ b/release/scripts/ui/properties_scene.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class SceneButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -38,7 +39,7 @@ class SCENE_PT_scene(SceneButtonsPanel):
         layout = self.layout
         col2 = context.region.width > narrowui
         scene = context.scene
-        
+
         if col2:
             layout.itemR(scene, "camera")
             layout.itemR(scene, "set", text="Background")
@@ -61,10 +62,10 @@ class SCENE_PT_unit(SceneButtonsPanel):
 
         split = layout.split()
         split.active = (unit.system != 'NONE')
-        
+
         col = split.column()
         col.itemR(unit, "scale_length", text="Scale")
-        
+
         if col2:
             col = split.column()
         col.itemR(unit, "use_separate")
@@ -163,9 +164,9 @@ class SCENE_PT_physics(SceneButtonsPanel):
 
         scene = context.scene
         col2 = context.region.width > narrowui
-        
+
         layout.active = scene.use_gravity
-        
+
         if col2:
             layout.itemR(scene, "gravity", text="")
         else:

diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py
index 7a0c7b939beab5b1190b80c9b5cb4e479f24478b..7cab499c0dc6ebf9c9e0f71e68bfe7fc47895b84 100644 (file)
--- a/release/scripts/ui/properties_texture.py
+++ b/release/scripts/ui/properties_texture.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 def active_node_mat(mat):
     if mat:
         mat_node = mat.active_node_material
@@ -33,22 +34,21 @@ def active_node_mat(mat):
 
 
 def context_tex_datablock(context):
+    idblock = active_node_mat(context.material)
+    if idblock:
+        return idblock
 
-        idblock = active_node_mat(context.material)
-        if idblock:
-            return idblock
-
-        idblock = context.lamp
-        if idblock:
-            return idblock
-
-        idblock = context.world
-        if idblock:
-            return idblock
+    idblock = context.lamp
+    if idblock:
+        return idblock
 
-        idblock = context.brush
+    idblock = context.world
+    if idblock:
         return idblock
 
+    idblock = context.brush
+    return idblock
+
 
 class TextureButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
@@ -103,8 +103,6 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel):
             col.item_enumO("texture.slot_move", "type", 'DOWN', text="", icon='ICON_TRIA_DOWN')
 
 
-        
-
         if col2:
             split = layout.split(percentage=0.65)
             if idblock:
@@ -190,7 +188,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel):
         idblock = context_tex_datablock(context)
 
         tex = context.texture_slot
-        textype = context.texture
+        # textype = context.texture
         col2 = context.region.width > narrowui
 
         if type(idblock) != bpy.types.Brush:
@@ -257,12 +255,12 @@ class TEXTURE_PT_mapping(TextureSlotPanel):
 
             # any non brush
             split = layout.split()
-            
-            col = split.column() 
+
+            col = split.column()
             col.itemR(tex, "offset")
-            
+
             if col2:
-                col = split.column()    
+                col = split.column()
             col.itemR(tex, "size")
 
 
@@ -278,7 +276,7 @@ class TEXTURE_PT_influence(TextureSlotPanel):
 
         idblock = context_tex_datablock(context)
 
-        textype = context.texture
+        # textype = context.texture
         tex = context.texture_slot
         col2 = context.region.width > narrowui
 
@@ -342,7 +340,7 @@ class TEXTURE_PT_influence(TextureSlotPanel):
 
             col = split.column()
             factor_but(col, tex.map_color, "map_color", "color_factor", "Color")
-           
+
             if col2:
                 col = split.column()
             factor_but(col, tex.map_shadow, "map_shadow", "shadow_factor", "Shadow")
@@ -411,7 +409,7 @@ class TEXTURE_PT_clouds(TextureTypePanel):
         col = split.column()
         col.itemR(tex, "noise_size", text="Size")
         col.itemR(tex, "noise_depth", text="Depth")
-        
+
         if col2:
             col = split.column()
         col.itemR(tex, "nabla", text="Nabla")
@@ -444,11 +442,11 @@ class TEXTURE_PT_wood(TextureTypePanel):
 
         split = layout.split()
         split.active = tex.stype in ('RINGNOISE', 'BANDNOISE')
-        
+
         col = split.column()
         col.itemR(tex, "noise_size", text="Size")
         col.itemR(tex, "turbulence")
-        
+
         col = split.column()
         col.itemR(tex, "nabla")
 
@@ -473,11 +471,11 @@ class TEXTURE_PT_marble(TextureTypePanel):
             layout.itemR(tex, "noise_basis", text="")
 
         split = layout.split()
-        
+
         col = split.column()
         col.itemR(tex, "noise_size", text="Size")
         col.itemR(tex, "noise_depth", text="Depth")
-        
+
         if col2:
             col = split.column()
         col.itemR(tex, "turbulence")
@@ -495,10 +493,10 @@ class TEXTURE_PT_magic(TextureTypePanel):
         col2 = context.region.width > narrowui
 
         split = layout.split()
-        
+
         col = split.column()
         col.itemR(tex, "noise_depth", text="Depth")
-        
+
         if col2:
             col = split.column()
         col.itemR(tex, "turbulence")
@@ -518,7 +516,7 @@ class TEXTURE_PT_blend(TextureTypePanel):
             layout.itemR(tex, "progression")
         else:
             layout.itemR(tex, "progression", text="")
-        
+
         sub = layout.row()
 
         sub.active = (tex.progression in ('LINEAR', 'QUADRATIC', 'EASING', 'RADIAL'))
@@ -547,7 +545,7 @@ class TEXTURE_PT_stucci(TextureTypePanel):
 
         col = split.column()
         col.itemR(tex, "noise_size", text="Size")
-        
+
         if col2:
             col = split.column()
         col.itemR(tex, "turbulence")
@@ -574,7 +572,7 @@ class TEXTURE_PT_image_sampling(TextureTypePanel):
         layout = self.layout
 
         tex = context.texture
-        slot = context.texture_slot
+        # slot = context.texture_slot
         col2 = context.region.width > narrowui
 
         split = layout.split()
@@ -650,11 +648,11 @@ class TEXTURE_PT_image_mapping(TextureTypePanel):
             row = col.row()
             row.itemR(tex, "checker_even", text="Even")
             row.itemR(tex, "checker_odd", text="Odd")
-            
+
             if col2:
                 col = split.column()
             col.itemR(tex, "checker_distance", text="Distance")
-           
+
             layout.itemS()
 
         split = layout.split()
@@ -679,7 +677,7 @@ class TEXTURE_PT_plugin(TextureTypePanel):
     def draw(self, context):
         layout = self.layout
 
-        tex = context.texture
+        # tex = context.texture
 
         layout.itemL(text="Nothing yet")
 
@@ -691,7 +689,7 @@ class TEXTURE_PT_envmap(TextureTypePanel):
     def draw(self, context):
         layout = self.layout
 
-        tex = context.texture
+        # tex = context.texture
 
         layout.itemL(text="Nothing yet")
 
@@ -737,7 +735,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel):
 
         col = split.column()
         col.itemR(tex, "noise_size", text="Size")
-        
+
         if col2:
             col = split.column()
         col.itemR(tex, "nabla")
@@ -780,7 +778,7 @@ class TEXTURE_PT_voronoi(TextureTypePanel):
 
         col = split.column()
         col.itemR(tex, "noise_size", text="Size")
-        
+
         if col2:
             col = split.column()
         col.itemR(tex, "nabla")
@@ -808,7 +806,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel):
         col = split.column()
         col.itemR(tex, "distortion", text="Distortion")
         col.itemR(tex, "noise_size", text="Size")
-        
+
         if col2:
             col = split.column()
         col.itemR(tex, "nabla")
@@ -915,7 +913,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel):
 
         tex = context.texture
         pd = tex.pointdensity
-        
+
         layout.itemR(pd, "turbulence", text="")
 
     def draw(self, context):

diff --git a/release/scripts/ui/properties_world.py b/release/scripts/ui/properties_world.py
index d1b8c3b36baaf7ce7c6c69eda962650db36de59d..35fe2dcdce1c6df46df88043875c28af60129f2a 100644 (file)
--- a/release/scripts/ui/properties_world.py
+++ b/release/scripts/ui/properties_world.py
@@ -21,6 +21,7 @@ import bpy
 
 narrowui = 180
 
+
 class WorldButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -57,7 +58,7 @@ class WORLD_PT_context_world(WorldButtonsPanel):
         space = context.space_data
         col2 = context.region.width > narrowui
 
-        
+
         if col2:
             split = layout.split(percentage=0.65)
             if scene:
@@ -67,6 +68,7 @@ class WORLD_PT_context_world(WorldButtonsPanel):
         else:
             layout.template_ID(scene, "world", new="world.new")
 
+
 class WORLD_PT_world(WorldButtonsPanel):
     bl_label = "World"
     COMPAT_ENGINES = set(['BLENDER_RENDER'])
@@ -75,7 +77,7 @@ class WORLD_PT_world(WorldButtonsPanel):
         layout = self.layout
         col2 = context.region.width > narrowui
         world = context.world
-        
+
         if col2:
             row = layout.row()
             row.itemR(world, "paper_sky")
@@ -110,9 +112,9 @@ class WORLD_PT_mist(WorldButtonsPanel):
         world = context.world
 
         layout.active = world.mist.enabled
-        
+
         split = layout.split()
-        
+
         col = split.column()
         col.itemR(world.mist, "intensity", slider=True)
         col.itemR(world.mist, "start")
@@ -142,7 +144,7 @@ class WORLD_PT_stars(WorldButtonsPanel):
         layout.active = world.stars.enabled
 
         split = layout.split()
-        
+
         col = split.column()
         col.itemR(world.stars, "size")
         col.itemR(world.stars, "color_randomization", text="Colors")

diff --git a/release/scripts/ui/space_console.py b/release/scripts/ui/space_console.py
index d5392645387c8edd0d64a17b5e2e4e097056b3b3..e317c35459650877ef19d48b49d526544d5ed3ac 100644 (file)
--- a/release/scripts/ui/space_console.py
+++ b/release/scripts/ui/space_console.py
@@ -17,7 +17,6 @@
 # ##### END GPL LICENSE BLOCK #####
 
 # <pep8 compliant>
-import sys
 import bpy
 from bpy.props import *
 
@@ -83,6 +82,7 @@ class CONSOLE_MT_report(bpy.types.Menu):
         layout.itemO("console.report_delete")
         layout.itemO("console.report_copy")
 
+
 class CONSOLE_MT_language(bpy.types.Menu):
     bl_label = "Languages..."
 
@@ -102,6 +102,7 @@ class CONSOLE_MT_language(bpy.types.Menu):
         for language in languages:
             layout.item_stringO("console.language", "language", language, text=language[0].upper() + language[1:])
 
+
 def add_scrollback(text, text_type):
     for l in text.split('\n'):
         bpy.ops.console.scrollback_append(text=l.replace('\t', '    '),
@@ -170,11 +171,10 @@ class ConsoleBanner(bpy.types.Operator):
         return ('FINISHED',)
 
 
-
 class ConsoleLanguage(bpy.types.Operator):
     '''Set the current language for this console'''
     bl_idname = "console.language"
-    language = StringProperty(name="Language", maxlen= 32, default= "")
+    language = StringProperty(name="Language", maxlen=32, default="")
 
     def execute(self, context):
         sc = context.space_data

diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py
index 95425958f3e44aa757cd45b24f0c20a8c905c578..7c0fd8d6d605cc72d93dc81f146585d9da609489 100644 (file)
--- a/release/scripts/ui/space_image.py
+++ b/release/scripts/ui/space_image.py
@@ -27,7 +27,7 @@ class IMAGE_MT_view(bpy.types.Menu):
         layout = self.layout
 
         sima = context.space_data
-        uv = sima.uv_editor
+        # uv = sima.uv_editor
         settings = context.tool_settings
 
         show_uvedit = sima.show_uvedit
@@ -227,8 +227,8 @@ class IMAGE_HT_header(bpy.types.Header):
         iuser = sima.image_user
         settings = context.tool_settings
 
-        show_render = sima.show_render
-        show_paint = sima.show_paint
+        # show_render = sima.show_render
+        # show_paint = sima.show_paint
         show_uvedit = sima.show_uvedit
 
         row = layout.row(align=True)
@@ -264,17 +264,14 @@ class IMAGE_HT_header(bpy.types.Header):
             else:
                 layout.itemR(settings, "uv_selection_mode", text="", expand=True)
                 layout.itemR(uvedit, "sticky_selection_mode", text="", icon_only=True)
-            pass
 
             row = layout.row(align=True)
             row.itemR(settings, "snap", text="")
             if settings.snap:
                 row.itemR(settings, "snap_mode", text="")
 
-            """
-            mesh = context.edit_object.data
-            row.item_pointerR(mesh, "active_uv_layer", mesh, "uv_textures")
-            """
+            # mesh = context.edit_object.data
+            # row.item_pointerR(mesh, "active_uv_layer", mesh, "uv_textures")
 
         if ima:
             # layers
@@ -310,7 +307,7 @@ class IMAGE_PT_image_properties(bpy.types.Panel):
         layout = self.layout
 
         sima = context.space_data
-        ima = sima.image
+        # ima = sima.image
         iuser = sima.image_user
 
         layout.template_image(sima, "image", iuser, compact=True)

diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py
index b5e73e6058207f4b07a0c55acffa09be364d4e86..3105ae9ff75b6bcaf94442d30ce096782a313e30 100644 (file)
--- a/release/scripts/ui/space_info.py
+++ b/release/scripts/ui/space_info.py
@@ -29,7 +29,6 @@ class INFO_HT_header(bpy.types.Header):
     def draw(self, context):
         layout = self.layout
 
-        st = context.space_data
         scene = context.scene
         rd = scene.render_data
 
@@ -237,7 +236,7 @@ class INFO_MT_render(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        rd = context.scene.render_data
+        # rd = context.scene.render_data
 
         layout.itemO("screen.render", text="Render Image", icon='ICON_RENDER_STILL')
         layout.item_booleanO("screen.render", "animation", True, text="Render Animation", icon='ICON_RENDER_ANIMATION')
@@ -377,3 +376,4 @@ bpy.ops.add(HELP_OT_developer_community)
 bpy.ops.add(HELP_OT_user_community)
 bpy.ops.add(HELP_OT_report_bug)
 bpy.ops.add(HELP_OT_operator_cheat_sheet)
+

diff --git a/release/scripts/ui/space_node.py b/release/scripts/ui/space_node.py
index 5c93bede635d580859b40579330fa2f58de28176..4f61abef10fd49c318257095789f60f2c978b26c 100644 (file)
--- a/release/scripts/ui/space_node.py
+++ b/release/scripts/ui/space_node.py
@@ -43,27 +43,27 @@ class NODE_HT_header(bpy.types.Header):
 
         if snode.tree_type == 'MATERIAL':
             ob = snode.id_from
-            id = snode.id
+            snode_id = snode.id
             if ob:
                 layout.template_ID(ob, "active_material", new="material.new")
-            if id:
-                layout.itemR(id, "use_nodes")
+            if snode_id:
+                layout.itemR(snode_id, "use_nodes")
 
         elif snode.tree_type == 'TEXTURE':
             row.itemR(snode, "texture_type", text="", expand=True)
 
-            id = snode.id
+            snode_id = snode.id
             id_from = snode.id_from
             if id_from:
                 layout.template_ID(id_from, "active_texture", new="texture.new")
-            if id:
-                layout.itemR(id, "use_nodes")
+            if snode_id:
+                layout.itemR(snode_id, "use_nodes")
 
         elif snode.tree_type == 'COMPOSITING':
-            id = snode.id
+            snode_id = snode.id
 
-            layout.itemR(id, "use_nodes")
-            layout.itemR(id.render_data, "free_unused_nodes", text="Free Unused")
+            layout.itemR(snode_id, "use_nodes")
+            layout.itemR(snode_id.render_data, "free_unused_nodes", text="Free Unused")
             layout.itemR(snode, "backdrop")
 
 
@@ -72,7 +72,7 @@ class NODE_MT_view(bpy.types.Menu):
 
     def draw(self, context):
         layout = self.layout
-        
+
         layout.itemO("node.properties", icon='ICON_MENU_PANEL')
         layout.itemS()
 

diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py
index 9468510c7a56eccaf7948c58eae30f8ac43fdab0..de499a5089db17ed326226c2c1b84728e0a721a7 100644 (file)
--- a/release/scripts/ui/space_sequencer.py
+++ b/release/scripts/ui/space_sequencer.py
@@ -133,8 +133,6 @@ class SEQUENCER_MT_select(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        st = context.space_data
-
         layout.column()
         layout.item_enumO("sequencer.select_active_side", "side", 'LEFT', text="Strips to the Left")
         layout.item_enumO("sequencer.select_active_side", "side", 'RIGHT', text="Strips to the Right")
@@ -154,8 +152,6 @@ class SEQUENCER_MT_marker(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        st = context.space_data
-
         layout.column()
         layout.itemO("marker.add", text="Add Marker")
         layout.itemO("marker.duplicate", text="Duplicate Marker")
@@ -174,8 +170,6 @@ class SEQUENCER_MT_add(bpy.types.Menu):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
 
-        st = context.space_data
-
         layout.column()
         layout.itemO("sequencer.scene_strip_add", text="Scene")
         layout.itemO("sequencer.movie_strip_add", text="Movie")
@@ -191,7 +185,6 @@ class SEQUENCER_MT_add_effect(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
-        st = context.space_data
 
         layout.column()
         layout.item_enumO("sequencer.effect_strip_add", 'type', 'ADD')
@@ -215,8 +208,6 @@ class SEQUENCER_MT_strip(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        st = context.space_data
-
         layout.operator_context = 'INVOKE_REGION_WIN'
 
         layout.column()

diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py
index 42734589d48c7818a70098bbed7d073d41d20b1b..638656bcee5e605292487125dc8715f0bae61233 100644 (file)
--- a/release/scripts/ui/space_time.py
+++ b/release/scripts/ui/space_time.py
@@ -26,7 +26,6 @@ class TIME_HT_header(bpy.types.Header):
     def draw(self, context):
         layout = self.layout
 
-        st = context.space_data
         scene = context.scene
         tools = context.tool_settings
         screen = context.screen
@@ -103,7 +102,7 @@ class TIME_MT_frame(bpy.types.Menu):
 
     def draw(self, context):
         layout = self.layout
-        tools = context.tool_settings
+        # tools = context.tool_settings
 
         layout.itemO("marker.add", text="Add Marker")
         layout.itemO("marker.duplicate", text="Duplicate Marker")

diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py
index 68f01146026c9a29fc15bc8db1aaa5c1944a667d..18e82ae240df707c37ae61b8a63928301816753f 100644 (file)
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/ui/space_userpref.py
@@ -41,7 +41,7 @@ class USERPREF_MT_view(bpy.types.Menu):
     bl_label = "View"
 
     def draw(self, context):
-        layout = self.layout
+        pass # layout = self.layout
 
 
 class USERPREF_PT_tabs(bpy.types.Panel):
@@ -383,7 +383,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col.itemR(v3d, "editmesh_active", slider=True)
 
             col = split.column()
-            
+
             col.itemR(v3d, "object_selected")
             col.itemR(v3d, "object_active")
             col.itemR(v3d, "object_grouped")
@@ -736,45 +736,45 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col.itemR(graph, "button")
             col.itemR(graph, "button_title")
             col.itemR(graph, "button_text")
-            
+
             col = split.column()
             col.itemR(graph, "header")
             col.itemR(graph, "grid")
             col.itemR(graph, "list")
             col.itemR(graph, "channel_group")
-            
+
             col = split.column()
             col.itemR(graph, "active_channels_group")
             col.itemR(graph, "dopesheet_channel")
             col.itemR(graph, "dopesheet_subchannel")
             col.itemR(graph, "vertex")
-            
+
             col = split.column()
             col.itemR(graph, "current_frame")
             col.itemR(graph, "handle_vertex")
             col.itemR(graph, "handle_vertex_select")
             col.itemS()
             col.itemR(graph, "handle_vertex_size")
-            
+
         elif theme.active_theme == 'FILE_BROWSER':
-            file = theme.file_browser
+            file_browse = theme.file_browser
 
             col = split.column()
-            col.itemR(file, "back")
-            col.itemR(file, "text")
-            col.itemR(file, "text_hi")
+            col.itemR(file_browse, "back")
+            col.itemR(file_browse, "text")
+            col.itemR(file_browse, "text_hi")
 
             col = split.column()
-            col.itemR(file, "header")
-            col.itemR(file, "list")
+            col.itemR(file_browse, "header")
+            col.itemR(file_browse, "list")
 
             col = split.column()
-            col.itemR(file, "selected_file")
-            col.itemR(file, "tiles")
+            col.itemR(file_browse, "selected_file")
+            col.itemR(file_browse, "tiles")
 
             col = split.column()
-            col.itemR(file, "active_file")
-            col.itemR(file, "active_file_text")
+            col.itemR(file_browse, "active_file")
+            col.itemR(file_browse, "active_file_text")
 
         elif theme.active_theme == 'NLA_EDITOR':
             nla = theme.nla_editor
@@ -783,17 +783,17 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col.itemR(nla, "back")
             col.itemR(nla, "button")
             col.itemR(nla, "button_title")
-            
+
             col = split.column()
             col.itemR(nla, "button_text")
             col.itemR(nla, "text")
             col.itemR(nla, "header")
-            
+
             col = split.column()
             col.itemR(nla, "grid")
             col.itemR(nla, "bars")
             col.itemR(nla, "bars_selected")
-            
+
             col = split.column()
             col.itemR(nla, "strips")
             col.itemR(nla, "strips_selected")
@@ -830,7 +830,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col = split.column()
             col.itemR(image, "back")
             col.itemR(image, "button")
-            
+
             col = split.column()
             col.itemR(image, "button_title")
             col.itemR(image, "button_text")
@@ -875,7 +875,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
 
             col = split.column()
             col.itemR(prop, "back")
-            
+
             col = split.column()
             col.itemR(prop, "title")
 
@@ -893,7 +893,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col.itemR(text, "button")
             col.itemR(text, "button_title")
             col.itemR(text, "button_text")
-            
+
             col = split.column()
             col.itemR(text, "text")
             col.itemR(text, "text_hi")
@@ -923,7 +923,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
 
             col = split.column()
             col.itemR(time, "grid")
-            
+
             col = split.column()
             col.itemR(time, "current_frame")
 
@@ -935,7 +935,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
             col.itemR(node, "button")
             col.itemR(node, "button_title")
             col.itemR(node, "button_text")
-            
+
 
             col = split.column()
             col.itemR(node, "text")
@@ -980,7 +980,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
 
             col = split.column()
             col.itemR(out, "text")
-            
+
             col = split.column()
             col.itemR(out, "text_hi")
 
@@ -1009,7 +1009,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
 
             col = split.column()
             col.itemR(prefs, "text")
-            
+
             col = split.column()
             col.itemR(prefs, "header")
 
@@ -1065,7 +1065,7 @@ class USERPREF_PT_file(bpy.types.Panel):
 
         col = split.column()
         sub = col.split(percentage=0.2)
-        sub1 = sub.column()
+        sub.column() # sub1, unused
         sub2 = sub.column()
         sub2.itemL(text="Save & Load:")
         sub2.itemR(paths, "use_relative_paths")
@@ -1101,7 +1101,7 @@ class USERPREF_PT_input(bpy.types.Panel):
         userpref = context.user_preferences
         wm = context.manager
         #input = userpref.input
-        input = userpref
+        #input = userpref
         inputs = userpref.inputs
 
         split = layout.split(percentage=0.25)
@@ -1159,7 +1159,7 @@ class USERPREF_PT_input(bpy.types.Panel):
         # Keymap Settings
         col = split.column()
 
-        kc = wm.active_keyconfig
+        # kc = wm.active_keyconfig
         defkc = wm.default_keyconfig
         km = wm.active_keymap
 
@@ -1398,7 +1398,7 @@ class WM_OT_keyitem_add(bpy.types.Operator):
     def execute(self, context):
         wm = context.manager
         km = wm.active_keymap
-        kmi = km.add_item("", 'A', 'PRESS')
+        km.add_item("", 'A', 'PRESS') # kmi
         return ('FINISHED',)
 
 

diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py
index 309d46307e707804e5be17ff02c80cb1d67ec057..92c6a13b4ac01047e7c5fd2439ad7d0643b9fefa 100644 (file)
--- a/release/scripts/ui/space_view3d.py
+++ b/release/scripts/ui/space_view3d.py
@@ -27,7 +27,7 @@ class VIEW3D_HT_header(bpy.types.Header):
     def draw(self, context):
         layout = self.layout
 
-        view = context.space_data
+        # view = context.space_data
         mode_string = context.mode
         edit_object = context.edit_object
         object = context.active_object
@@ -48,8 +48,6 @@ class VIEW3D_HT_header(bpy.types.Header):
             if edit_object:
                 sub.itemM("VIEW3D_MT_edit_%s" % edit_object.type.lower())
             elif object:
-                ob_mode_string = object.mode
-
                 if mode_string not in ['PAINT_WEIGHT', 'PAINT_TEXTURE']:
                     sub.itemM("VIEW3D_MT_%s" % mode_string.lower())
             else:
@@ -90,6 +88,7 @@ class VIEW3D_MT_snap(bpy.types.Menu):
         layout.itemO("view3d.snap_cursor_to_grid", text="Cursor to Grid")
         layout.itemO("view3d.snap_cursor_to_active", text="Cursor to Active")
 
+
 class VIEW3D_MT_uv_map(dynamic_menu.DynMenu):
     bl_label = "UV Mapping"
 
@@ -665,8 +664,6 @@ class VIEW3D_MT_paint_vertex(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        sculpt = context.tool_settings.sculpt
-
         layout.itemO("paint.vertex_color_set")
         props = layout.itemO("paint.vertex_color_set", text="Set Selected Vertex Colors", properties=True)
         props.selected = True
@@ -694,16 +691,18 @@ class VIEW3D_MT_sculpt(bpy.types.Menu):
         layout.item_menu_enumO("brush.curve_preset", property="shape")
         layout.itemS()
 
-        if brush.sculpt_tool != 'GRAB':
+        sculpt_tool = brush.sculpt_tool
+
+        if sculpt_tool != 'GRAB':
             layout.itemR(brush, "use_airbrush")
 
-            if brush.sculpt_tool != 'LAYER':
+            if sculpt_tool != 'LAYER':
                 layout.itemR(brush, "use_anchor")
 
-            if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
+            if sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
                 layout.itemR(brush, "flip_direction")
 
-            if brush.sculpt_tool == 'LAYER':
+            if sculpt_tool == 'LAYER':
                 layout.itemR(brush, "use_persistent")
                 layout.itemO("sculpt.set_persistent_base")
 
@@ -1375,6 +1374,7 @@ class VIEW3D_PT_3dview_properties(bpy.types.Panel):
 
         layout.column().itemR(scene, "cursor_location", text="3D Cursor:")
 
+
 class VIEW3D_PT_3dview_item(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
@@ -1399,6 +1399,7 @@ class VIEW3D_PT_3dview_item(bpy.types.Panel):
                 row.itemL(text="", icon='ICON_BONE_DATA')
                 row.itemR(bone, "name", text="")
 
+
 class VIEW3D_PT_3dview_display(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
@@ -1508,7 +1509,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
 
     def poll(self, context):
         view = context.space_data
-        bg = context.space_data.background_image
+        # bg = context.space_data.background_image
         return (view)
 
     def draw_header(self, context):

diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py
index 771e1e9046b9f3ae38e2b8aff122d69389b17ded..434d9a458fa347403cfd3e6d37890f182e605067 100644 (file)
--- a/release/scripts/ui/space_view3d_toolbar.py
+++ b/release/scripts/ui/space_view3d_toolbar.py
@@ -514,11 +514,11 @@ class VIEW3D_PT_tools_brush(PaintPanel):
                 row.itemR(brush, "strength", slider=True)
                 row.itemR(brush, "use_strength_pressure", text="")
 
-                ''' # XXX - TODO
-                row = col.row(align=True)
-                row.itemR(brush, "jitter", slider=True)
-                row.itemR(brush, "use_jitter_pressure", toggle=True, text="")
-                '''
+                # XXX - TODO
+                #row = col.row(align=True)
+                #row.itemR(brush, "jitter", slider=True)
+                #row.itemR(brush, "use_jitter_pressure", toggle=True, text="")
+
                 col = layout.column()
 
                 if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
@@ -587,11 +587,10 @@ class VIEW3D_PT_tools_brush(PaintPanel):
             row.itemR(brush, "strength", slider=True)
             row.itemR(brush, "use_strength_pressure", toggle=True, text="")
 
-            ''' # XXX - TODO
-            row = col.row(align=True)
-            row.itemR(brush, "jitter", slider=True)
-            row.itemR(brush, "use_jitter_pressure", toggle=True, text="")
-            '''
+            # XXX - TODO
+            #row = col.row(align=True)
+            #row.itemR(brush, "jitter", slider=True)
+            #row.itemR(brush, "use_jitter_pressure", toggle=True, text="")
 
 
 class VIEW3D_PT_tools_brush_stroke(PaintPanel):
@@ -694,8 +693,6 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel):
     def draw(self, context):
         layout = self.layout
 
-        wpaint = context.tool_settings.weight_paint
-
         col = layout.column()
         # col.itemL(text="Blend:")
         col.itemO("object.vertex_group_normalize_all", text="Normalize All")