[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42185] trunk/blender/intern/cycles/ blender/addon: minor cycles edits
Campbell Barton
ideasman42 at gmail.com
Sun Nov 27 04:49:18 CET 2011
Revision: 42185
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42185
Author: campbellbarton
Date: 2011-11-27 03:49:09 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
minor cycles edits
- use sets rather then tuples
- use relative imports
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/__init__.py
trunk/blender/intern/cycles/blender/addon/engine.py
trunk/blender/intern/cycles/blender/addon/enums.py
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
Modified: trunk/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/__init__.py 2011-11-27 02:05:46 UTC (rev 42184)
+++ trunk/blender/intern/cycles/blender/addon/__init__.py 2011-11-27 03:49:09 UTC (rev 42185)
@@ -33,14 +33,9 @@
"category": "Render"}
import bpy
+from . import ui, properties, xml, engine, presets
-from cycles import ui
-from cycles import properties
-from cycles import xml
-from cycles import engine
-from cycles import presets
-
class CyclesRender(bpy.types.RenderEngine):
bl_idname = 'CYCLES'
bl_label = "Cycles Render"
Modified: trunk/blender/intern/cycles/blender/addon/engine.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/engine.py 2011-11-27 02:05:46 UTC (rev 42184)
+++ trunk/blender/intern/cycles/blender/addon/engine.py 2011-11-27 03:49:09 UTC (rev 42185)
@@ -56,7 +56,7 @@
def render(engine):
import bcycles
- if "session" in dir(engine):
+ if hasattr(engine, "session"):
bcycles.render(engine.session)
Modified: trunk/blender/intern/cycles/blender/addon/enums.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/enums.py 2011-11-27 02:05:46 UTC (rev 42184)
+++ trunk/blender/intern/cycles/blender/addon/enums.py 2011-11-27 03:49:09 UTC (rev 42185)
@@ -18,7 +18,7 @@
# <pep8 compliant>
-from cycles import engine
+from . import engine
def get_gpu_device():
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2011-11-27 02:05:46 UTC (rev 42184)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2011-11-27 03:49:09 UTC (rev 42185)
@@ -27,7 +27,7 @@
import math
-from cycles import enums
+from . import enums
class CyclesRenderSettings(bpy.types.PropertyGroup):
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2011-11-27 02:05:46 UTC (rev 42184)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2011-11-27 03:49:09 UTC (rev 42185)
@@ -22,8 +22,7 @@
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 @@
@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 @@
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 @@
@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 @@
@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 get_panels():
- return [
+ return (
bpy.types.RENDER_PT_render,
bpy.types.RENDER_PT_output,
bpy.types.RENDER_PT_encoding,
@@ -782,7 +783,8 @@
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():
More information about the Bf-blender-cvs
mailing list