[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59394] trunk/blender/intern/cycles/ blender/addon/ui.py: style cleanup: pep8

[Campbell Barton]

Revision: 59394
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59394
Author:   campbellbarton
Date:     2013-08-23 04:04:46 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
style cleanup: pep8

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-08-22 23:15:45 UTC (rev 59393)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-08-23 04:04:46 UTC (rev 59394)
@@ -53,7 +53,7 @@
     if cscene.progressive:
         aa = cscene.samples
         if cscene.use_square_samples:
-            aa = aa*aa
+            aa = aa * aa
     else:
         aa = cscene.aa_samples
         d = cscene.diffuse_samples
@@ -62,16 +62,16 @@
         ao = cscene.ao_samples
         ml = cscene.mesh_light_samples
         sss = cscene.subsurface_samples
-        
+
         if cscene.use_square_samples:
-            aa = aa*aa
-            d = d*d
-            g = g*g
-            t = t*t
-            ao = ao*ao
-            ml = ml*ml
-            sss = sss*sss
-            
+            aa = aa * aa
+            d = d * d
+            g = g * g
+            t = t * t
+            ao = ao * ao
+            ml = ml * ml
+            sss = sss * sss
+
     # Draw interface
     col = layout.column(align=True)
     col.scale_y = 0.6
@@ -80,9 +80,11 @@
     if cscene.progressive:
         col.label("%s AA" % aa)
     else:
-        col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" % (aa, d*aa, g*aa, t*aa))
+        col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" %
+                  (aa, d * aa, g * aa, t * aa))
         col.separator()
-        col.label("%s AO, %s Mesh Light, %s Subsurface" % (ao*aa, ml*aa, sss*aa))
+        col.label("%s AO, %s Mesh Light, %s Subsurface" %
+                  (ao * aa, ml * aa, sss * aa))
 
 
 class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
@@ -95,18 +97,18 @@
         scene = context.scene
         cscene = scene.cycles
         device_type = context.user_preferences.system.compute_device_type
-        
+
         row = layout.row(align=True)
         row.menu("CYCLES_MT_sampling_presets", text=bpy.types.CYCLES_MT_sampling_presets.bl_label)
         row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMIN")
         row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True
-        
+
         row = layout.row()
         row.prop(cscene, "progressive")
         row.prop(cscene, "use_square_samples")
-        
+
         split = layout.split()
-        
+
         col = split.column()
         sub = col.column(align=True)
         sub.label("Settings:")
@@ -142,7 +144,7 @@
                 layout.separator()
                 layout.row().prop(cscene, "use_layer_samples")
                 break
-                
+
         draw_samples_info(layout, cscene)
 
 
@@ -279,7 +281,7 @@
 
         col.separator()
 
-        col.label(text="Acceleration structure:")   
+        col.label(text="Acceleration structure:")
         col.prop(cscene, "debug_use_spatial_splits")
 
 
@@ -413,7 +415,7 @@
         row.prop(rl, "use_pass_subsurface_direct", text="Direct", toggle=True)
         row.prop(rl, "use_pass_subsurface_indirect", text="Indirect", toggle=True)
         row.prop(rl, "use_pass_subsurface_color", text="Color", toggle=True)
-        
+
         col.separator()
         col.prop(rl, "use_pass_emit", text="Emission")
         col.prop(rl, "use_pass_environment")
@@ -588,7 +590,8 @@
     @classmethod
     def poll(cls, context):
         ob = context.object
-        return CyclesButtonsPanel.poll(context) and ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'LAMP'}
+        return (CyclesButtonsPanel.poll(context) and
+                ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'LAMP'})
 
     def draw(self, context):
         layout = self.layout