[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41848] trunk/blender: set cycles scripts as pep8 & make some minor changes.
Campbell Barton
ideasman42 at gmail.com
Tue Nov 15 03:58:05 CET 2011
Revision: 41848
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41848
Author: campbellbarton
Date: 2011-11-15 02:58:01 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
set cycles scripts as pep8 & make some minor changes.
also update sphinx doc generator.
Modified Paths:
--------------
trunk/blender/doc/python_api/sphinx_doc_gen.py
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/presets.py
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/blender/addon/xml.py
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-11-15 02:05:32 UTC (rev 41847)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-11-15 02:58:01 UTC (rev 41848)
@@ -589,6 +589,7 @@
"active_base": ("ObjectBase", False),
"active_bone": ("Bone", False),
"active_object": ("Object", False),
+ "active_operator": ("Operator", False),
"active_pose_bone": ("PoseBone", False),
"armature": ("Armature", False),
"bone": ("Bone", False),
@@ -597,6 +598,7 @@
"cloth": ("ClothModifier", False),
"collision": ("CollisionModifier", False),
"curve": ("Curve", False),
+ "dynamic_paint": ("DynamicPaintModifier", False),
"edit_bone": ("EditBone", False),
"edit_image": ("Image", False),
"edit_object": ("Object", False),
@@ -635,6 +637,7 @@
"speaker": ("Speaker", False),
"texture": ("Texture", False),
"texture_slot": ("MaterialTextureSlot", False),
+ "texture_user": ("ID", False),
"vertex_paint_object": ("Object", False),
"visible_bases": ("ObjectBase", True),
"visible_bones": ("Object", True),
Modified: trunk/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/__init__.py 2011-11-15 02:05:32 UTC (rev 41847)
+++ trunk/blender/intern/cycles/blender/addon/__init__.py 2011-11-15 02:58:01 UTC (rev 41848)
@@ -16,10 +16,12 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
+# <pep8 compliant>
+
bl_info = {
"name": "Cycles Render Engine",
"author": "",
- "version": (0,0),
+ "version": (0, 0),
"blender": (2, 6, 0),
"api": 41670,
"location": "Info header, render engine menu",
@@ -38,6 +40,7 @@
from cycles import engine
from cycles import presets
+
class CyclesRender(bpy.types.RenderEngine):
bl_idname = 'CYCLES'
bl_label = "Cycles"
@@ -46,7 +49,7 @@
def __init__(self):
engine.init()
self.session = None
-
+
def __del__(self):
engine.free(self)
@@ -64,7 +67,7 @@
#
# def preview_render(self):
# pass
-
+
# viewport render
def view_update(self, context):
if not self.session:
@@ -75,6 +78,7 @@
def view_draw(self, context):
engine.draw(self, context.region, context.space_data, context.region_data)
+
def register():
properties.register()
ui.register()
@@ -82,10 +86,10 @@
presets.register()
bpy.utils.register_module(__name__)
+
def unregister():
xml.unregister()
ui.unregister()
properties.unregister()
presets.unregister()
bpy.utils.unregister_module(__name__)
-
Modified: trunk/blender/intern/cycles/blender/addon/engine.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/engine.py 2011-11-15 02:05:32 UTC (rev 41847)
+++ trunk/blender/intern/cycles/blender/addon/engine.py 2011-11-15 02:58:01 UTC (rev 41848)
@@ -16,8 +16,11 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
+# <pep8 compliant>
+
import bpy
+
def init():
import bcycles
import os.path
@@ -27,7 +30,8 @@
bcycles.init(path, user_path)
-def create(engine, data, scene, region = 0, v3d = 0, rv3d = 0):
+
+def create(engine, data, scene, region=0, v3d=0, rv3d=0):
import bcycles
data = data.as_pointer()
@@ -41,18 +45,21 @@
engine.session = bcycles.create(engine.as_pointer(), data, scene, region, v3d, rv3d)
+
def free(engine):
- if "session" in dir(engine):
+ if hasattr(engine, "session"):
if engine.session:
import bcycles
bcycles.free(engine.session)
del engine.session
+
def render(engine):
import bcycles
if "session" in dir(engine):
bcycles.render(engine.session)
+
def update(engine, data, scene):
import bcycles
if scene.render.use_border:
@@ -61,6 +68,7 @@
else:
bcycles.sync(engine.session)
+
def draw(engine, region, v3d, rv3d):
import bcycles
v3d = v3d.as_pointer()
@@ -69,11 +77,12 @@
# draw render image
bcycles.draw(engine.session, v3d, rv3d)
+
def available_devices():
import bcycles
return bcycles.available_devices()
+
def with_osl():
import bcycles
return bcycles.with_osl()
-
Modified: trunk/blender/intern/cycles/blender/addon/enums.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/enums.py 2011-11-15 02:05:32 UTC (rev 41847)
+++ trunk/blender/intern/cycles/blender/addon/enums.py 2011-11-15 02:58:01 UTC (rev 41848)
@@ -16,8 +16,11 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
+# <pep8 compliant>
+
from cycles import engine
+
def get_gpu_device():
available_devices = engine.available_devices()
cuda = 'cuda' in available_devices
@@ -28,32 +31,36 @@
gpu_string = "CUDA GPU"
else:
gpu_string = "OpenCL GPU"
-
+
return gpu_string
devices = (
-("CPU", "CPU", "Processor"),
-("GPU", get_gpu_device(), "Graphics card"))
+ ("CPU", "CPU", "Processor"),
+ ("GPU", get_gpu_device(), "Graphics card"),
+ )
gpu_type = (
-("CUDA", "CUDA", "NVidia only"),
-("OPENCL", "OpenCL (incomplete)", ""))
+ ("CUDA", "CUDA", "NVidia only"),
+ ("OPENCL", "OpenCL (incomplete)", ""),
+ )
shading_systems = (
-("GPU_COMPATIBLE", "GPU Compatible", "Restricted shading system compatible with GPU rendering"),
-("OSL", "Open Shading Language", "Open Shading Language shading system that only runs on the CPU"))
+ ("GPU_COMPATIBLE", "GPU Compatible", "Restricted shading system compatible with GPU rendering"),
+ ("OSL", "Open Shading Language", "Open Shading Language shading system that only runs on the CPU"),
+ )
displacement_methods = (
-("BUMP", "Bump", "Bump mapping to simulate the appearance of displacement"),
-("TRUE", "True", "Use true displacement only, requires fine subdivision"),
-("BOTH", "Both", "Combination of displacement and bump mapping"))
+ ("BUMP", "Bump", "Bump mapping to simulate the appearance of displacement"),
+ ("TRUE", "True", "Use true displacement only, requires fine subdivision"),
+ ("BOTH", "Both", "Combination of displacement and bump mapping"),
+ )
bvh_types = (
-("DYNAMIC_BVH", "Dynamic BVH", "Objects can be individually updated, at the cost of slower render time"),
-("STATIC_BVH", "Static BVH", "Any object modification requires a complete BVH rebuild, but renders faster"))
+ ("DYNAMIC_BVH", "Dynamic BVH", "Objects can be individually updated, at the cost of slower render time"),
+ ("STATIC_BVH", "Static BVH", "Any object modification requires a complete BVH rebuild, but renders faster"),
+ )
filter_types = (
-("BOX", "Box", "Box filter"),
-("GAUSSIAN", "Gaussian", "Gaussian filter"))
-
-
+ ("BOX", "Box", "Box filter"),
+ ("GAUSSIAN", "Gaussian", "Gaussian filter"),
+ )
Modified: trunk/blender/intern/cycles/blender/addon/presets.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/presets.py 2011-11-15 02:05:32 UTC (rev 41847)
+++ trunk/blender/intern/cycles/blender/addon/presets.py 2011-11-15 02:58:01 UTC (rev 41848)
@@ -16,9 +16,12 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
+# <pep8 compliant>
+
from bl_operators.presets import AddPresetBase
from bpy.types import Operator
+
class AddPresetIntegrator(AddPresetBase, Operator):
'''Add an Integrator Preset'''
bl_idname = "render.cycles_integrator_preset_add"
@@ -41,13 +44,14 @@
]
preset_subdir = "cycles/integrator"
-
+
+
def register():
pass
+
def unregister():
pass
-
+
if __name__ == "__main__":
register()
-
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2011-11-15 02:05:32 UTC (rev 41847)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2011-11-15 02:58:01 UTC (rev 41848)
@@ -16,6 +16,8 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
+# <pep8 compliant>
+
import bpy
from bpy.props import *
@@ -23,6 +25,7 @@
from cycles import enums
+
class CyclesRenderSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -30,7 +33,7 @@
cls.device = EnumProperty(name="Device", description="Device to use for rendering",
items=enums.devices, default="CPU")
-
+
cls.gpu_type = EnumProperty(name="GPU Type", description="Processing system to use on the GPU",
items=enums.gpu_type, default="CUDA")
@@ -101,6 +104,7 @@
def unregister(cls):
del bpy.types.Scene.cycles
+
class CyclesCameraSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -112,11 +116,12 @@
default=0, min=0, max=100)
cls.aperture_rotation = FloatProperty(name="Aperture Rotation", description="Rotation of blades in aperture",
default=0, soft_min=-math.pi, soft_max=math.pi, subtype='ANGLE')
-
+
@classmethod
def unregister(cls):
del bpy.types.Camera.cycles
+
class CyclesMaterialSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -128,6 +133,7 @@
def unregister(cls):
del bpy.types.Material.cycles
+
class CyclesLampSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -138,6 +144,7 @@
def unregister(cls):
del bpy.types.Lamp.cycles
+
class CyclesWorldSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -147,6 +154,7 @@
def unregister(cls):
del bpy.types.World.cycles
+
class CyclesVisibilitySettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -162,6 +170,7 @@
def unregister(cls):
del bpy.types.Object.cycles_visibility
+
class CyclesMeshSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -181,6 +190,7 @@
del bpy.types.Curve.cycles
del bpy.types.MetaBall.cycles
+
def register():
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list