diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-27 07:49:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-27 07:49:09 +0400 |
commit | 42d50c75faa70e99ba8452930ee7c0f86e1b64e2 (patch) | |
tree | 8e7b863ba50bc8ced2e5a52c8621bd3ab7815d4c /intern | |
parent | 8423b1b33a51ecc45480d664e4bba7e488eac704 (diff) |
minor cycles edits
- use sets rather then tuples
- use relative imports
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/__init__.py | 7 | ||||
-rw-r--r-- | intern/cycles/blender/addon/engine.py | 2 | ||||
-rw-r--r-- | intern/cycles/blender/addon/enums.py | 2 | ||||
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 2 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 18 |
5 files changed, 14 insertions, 17 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index a7a8a74bf38..34ed3dd8072 100644 --- 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 a32a9e91499..2fedd2c0afa 100644 --- 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 463fdc19534..581dc08436a 100644 --- 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 95f898f3ca5..37de27dc6b4 100644 --- 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 224e44c287a..ca733c6eeb0 100644 --- 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(): |