code cleanup: python/pep8 and double-promotion warnings.

2 files changed, 10 insertions, 10 deletions

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 09db010363e..039fd39fc7d 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -416,7 +416,7 @@ class CyclesCameraSettings(bpy.types.PropertyGroup):
                 default=0.0,
                 step=1,
                 precision=4,
-                subtype = 'DISTANCE'
+                subtype='DISTANCE',
                 )
         cls.aperture_blades = IntProperty(
                 name="Aperture Blades",
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index aa489a297e7..4c3061e13a9 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -219,7 +219,7 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel):
         sub.label(text="Final Render:")
         sub.prop(rd, "use_persistent_data", text="Persistent Images")
 
-        
+
 class CyclesRender_PT_opengl(CyclesButtonsPanel, Panel):
     bl_label = "OpenGL Render"
     bl_options = {'DEFAULT_CLOSED'}
@@ -230,18 +230,18 @@ class CyclesRender_PT_opengl(CyclesButtonsPanel, Panel):
         rd = context.scene.render
 
         split = layout.split()
-        
+
         col = split.column()
         col.prop(rd, "use_antialiasing")
         sub = col.row()
         sub.active = rd.use_antialiasing
         sub.prop(rd, "antialiasing_samples", expand=True)
-        
+
         col = split.column()
         col.label(text="Alpha:")
         col.prop(rd, "alpha_mode", text="")
-        
-        
+
+
 class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
     bl_label = "Layers"
     bl_options = {'DEFAULT_CLOSED'}
@@ -872,8 +872,8 @@ class CyclesTexture_PT_context(CyclesButtonsPanel, Panel):
                 split = layout.split(percentage=0.2)
                 split.label(text="Type:")
                 split.prop(tex, "type", text="")
-                
-                
+
+
 class CyclesTexture_PT_node(CyclesButtonsPanel, Panel):
     bl_label = "Node"
     bl_context = "texture"
@@ -902,7 +902,7 @@ class CyclesTexture_PT_mapping(CyclesButtonsPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
-        
+
         node = context.texture_node
 
         mapping = node.texture_mapping
@@ -934,7 +934,7 @@ class CyclesTexture_PT_colors(CyclesButtonsPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
-        
+
         node = context.texture_node
 
         mapping = node.color_mapping