minor cycles edits

- use sets rather then tuples
- use relative imports

diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index a7a8a74bf38b3cba0e70e31d0e91720ec619d563..34ed3dd8072d3087a2c9e20468c1a671ff13b667 100644 (file)
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -33,12 +33,7 @@ bl_info = {
     "category": "Render"}
 
 import bpy
-
-from cycles import ui
-from cycles import properties
-from cycles import xml
-from cycles import engine
-from cycles import presets
+from . import ui, properties, xml, engine, presets
 
 
 class CyclesRender(bpy.types.RenderEngine):

diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index a32a9e91499152a3054af010a8b189a1c08af43f..2fedd2c0afa060675fa73e928d1dcd046e783016 100644 (file)
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -56,7 +56,7 @@ def free(engine):
 
 def render(engine):
     import bcycles
-    if "session" in dir(engine):
+    if hasattr(engine, "session"):
         bcycles.render(engine.session)
 
 

diff --git a/intern/cycles/blender/addon/enums.py b/intern/cycles/blender/addon/enums.py
index 463fdc19534f558ded0a0d09b162e1e210977573..581dc08436a925d670de865cc207fc41315b2fe3 100644 (file)
--- a/intern/cycles/blender/addon/enums.py
+++ b/intern/cycles/blender/addon/enums.py
@@ -18,7 +18,7 @@
 
 # <pep8 compliant>
 
-from cycles import engine
+from . import engine
 
 
 def get_gpu_device():

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 95f898f3ca5482b2c435279a1c4c0c4826e8633d..37de27dc6b4f7c9d1ff6d3182735bbb8e02b4cfc 100644 (file)
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -27,7 +27,7 @@ from bpy.props import (BoolProperty,
 
 import math
 
-from cycles import enums
+from . import enums
 
 
 class CyclesRenderSettings(bpy.types.PropertyGroup):

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 224e44c287aa2c0785006d0f14da413aa3435bae..ca733c6eeb080bd7d185a9d7208c21ea080a9f6c 100644 (file)
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -22,8 +22,7 @@ import bpy
 
 from bpy.types import Panel, Menu
 
-from cycles import enums
-from cycles import engine
+from . import enums, engine
 
 
 class CYCLES_MT_integrator_presets(Menu):
@@ -324,7 +323,7 @@ class CyclesObject_PT_ray_visibility(CyclesButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         ob = context.object
-        return CyclesButtonsPanel.poll(context) and ob and ob.type in ('MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META')  # todo: 'LAMP'
+        return CyclesButtonsPanel.poll(context) and ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META'}  # todo: 'LAMP'
 
     def draw(self, context):
         layout = self.layout
@@ -399,7 +398,7 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel):
         split = layout.split()
         col = split.column(align=True)
 
-        if lamp.type in ('POINT', 'SUN', 'SPOT'):
+        if lamp.type in {'POINT', 'SUN', 'SPOT'}:
             col.prop(lamp, "shadow_soft_size", text="Size")
         elif lamp.type == 'AREA':
             col.prop(lamp, "shape", text="")
@@ -460,7 +459,8 @@ class CyclesWorld_PT_volume(CyclesButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         # world = context.world
-        return False  # world and world.node_tree and CyclesButtonsPanel.poll(context)
+        # world and world.node_tree and CyclesButtonsPanel.poll(context)
+        return False
 
     def draw(self, context):
         layout = self.layout
@@ -494,7 +494,8 @@ class CyclesMaterial_PT_volume(CyclesButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         # mat = context.material
-        return False  # mat and mat.node_tree and CyclesButtonsPanel.poll(context)
+        # mat and mat.node_tree and CyclesButtonsPanel.poll(context)
+        return False
 
     def draw(self, context):
         layout = self.layout
@@ -730,7 +731,7 @@ def draw_pause(self, context):
 
 
 def get_panels():
-    return [
+    return (
         bpy.types.RENDER_PT_render,
         bpy.types.RENDER_PT_output,
         bpy.types.RENDER_PT_encoding,
@@ -782,7 +783,8 @@ def get_panels():
         bpy.types.PARTICLE_PT_field_weights,
         bpy.types.PARTICLE_PT_force_fields,
         bpy.types.PARTICLE_PT_vertexgroups,
-        bpy.types.PARTICLE_PT_custom_props]
+        bpy.types.PARTICLE_PT_custom_props,
+        )
 
 
 def register():