diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-24 23:36:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-24 23:36:12 +0400 |
commit | 6e28ac2d7b241d9ee859650d58a89e2b7d441ea7 (patch) | |
tree | 5a1aaeb5131a5ca240bd88e93b9fba0bdcaa1f30 /intern/cycles | |
parent | ddfc518caea168ae1882e717ef28a35f91705a14 (diff) |
pep8 edits and avoid naming conflicts with python builtins
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 5 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 12 | ||||
-rw-r--r-- | intern/cycles/blender/addon/xml.py | 6 |
4 files changed, 14 insertions, 11 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index e81f02f2090..b96048acf05 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -6,7 +6,7 @@ set(INC ../kernel/svm ../util ../subd - ../../../intern/guardedalloc + ../../guardedalloc ../../../source/blender/makesdna ../../../source/blender/makesrna ../../../source/blender/blenloader diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 0c7deb01ed8..21d49b03ea3 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -19,7 +19,10 @@ # <pep8 compliant> import bpy -from bpy.props import * +from bpy.props import (EnumProperty, + FloatProperty, + IntProperty, + PointerProperty) import math diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index f3ed3b677fb..224e44c287a 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -349,7 +349,7 @@ def find_node(material, nodetype): ntree = material.node_tree for node in ntree.nodes: - if hasattr(node, 'type') and node.type == nodetype: + if getattr(node, "type", None) == nodetype: return node return None @@ -363,14 +363,14 @@ def find_node_input(node, name): return None -def panel_node_draw(layout, id, output_type, input_name): - if not id.node_tree: - layout.prop(id, "use_nodes", icon='NODETREE') +def panel_node_draw(layout, id_data, output_type, input_name): + if not id_data.node_tree: + layout.prop(id_data, "use_nodes", icon='NODETREE') return False - ntree = id.node_tree + ntree = id_data.node_tree - node = find_node(id, output_type) + node = find_node(id_data, output_type) if not node: layout.label(text="No output node.") else: diff --git a/intern/cycles/blender/addon/xml.py b/intern/cycles/blender/addon/xml.py index e64023f046b..f17051d92dc 100644 --- a/intern/cycles/blender/addon/xml.py +++ b/intern/cycles/blender/addon/xml.py @@ -61,12 +61,12 @@ class ExportCyclesXML(bpy.types.Operator, ExportHelper): # get mesh scene = context.scene - object = context.object + obj = context.object - if not object: + if not obj: raise Exception("No active object") - mesh = object.to_mesh(scene, True, 'PREVIEW') + mesh = obj.to_mesh(scene, True, 'PREVIEW') if not mesh: raise Exception("No mesh data in active object") |