[Bf-blender-cvs] [d2929fe] bake-cycles: Cycles-Bake: [review] style cleanups (Python)
Dalai Felinto
noreply at git.blender.org
Wed Apr 23 02:47:42 CEST 2014
Commit: d2929fed997d8242c2fc1b6165765b56e0a0ca69
Author: Dalai Felinto
Date: Tue Mar 25 13:54:28 2014 -0300
https://developer.blender.org/rBd2929fed997d8242c2fc1b6165765b56e0a0ca69
Cycles-Bake: [review] style cleanups (Python)
===================================================================
M intern/cycles/blender/addon/__init__.py
M intern/cycles/blender/addon/engine.py
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
===================================================================
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 68622ec..27d9869 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -67,8 +67,8 @@ class CyclesRender(bpy.types.RenderEngine):
def render(self, scene):
engine.render(self)
- def bake(self, scene, object, pass_type, pixel_array, num_pixels, depth, result):
- engine.bake(self, object, pass_type, pixel_array, num_pixels, depth, result)
+ def bake(self, scene, obj, pass_type, pixel_array, num_pixels, depth, result):
+ engine.bake(self, obj, pass_type, pixel_array, num_pixels, depth, result)
# viewport render
def view_update(self, context):
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index 292ba97..0f5351c 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -59,10 +59,10 @@ def render(engine):
_cycles.render(engine.session)
-def bake(engine, object, pass_type, pixel_array, num_pixels, depth, result):
+def bake(engine, obj, pass_type, pixel_array, num_pixels, depth, result):
import _cycles
if hasattr(engine, "session"):
- _cycles.bake(engine.session, object.as_pointer(), pass_type, pixel_array.as_pointer(), num_pixels, depth, result.as_pointer())
+ _cycles.bake(engine.session, obj.as_pointer(), pass_type, pixel_array.as_pointer(), num_pixels, depth, result.as_pointer())
def reset(engine, data, scene):
import _cycles
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 34e3372..18603e5 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -157,63 +157,69 @@ def enum_color_depth_items(self, context):
bake_file_formats = ['BMP', 'PNG', 'JPEG', 'OPEN_EXR', 'TIFF', 'TARGA']
class CyclesBakeImageFormatSettings(bpy.types.PropertyGroup):
- enum_file_format_items = [(e.identifier, e.name, e.description) for e in bpy.types.OBJECT_OT_bake.bl_rna.properties['file_format'].enum_items if e.identifier in bake_file_formats]
- enum_exr_codec_items = [(e.identifier, e.name, e.description) for e in bpy.types.OBJECT_OT_bake.bl_rna.properties['exr_codec'].enum_items]
- enum_color_mode_items = [(e.identifier, e.name, e.description) for e in bpy.types.OBJECT_OT_bake.bl_rna.properties['color_mode'].enum_items]
+ props_base = bpy.types.OBJECT_OT_bake.bl_rna.properties
+
+ enum_file_format_items = [(e.identifier, e.name, e.description) for e in props_base['file_format'].enum_items if e.identifier in bake_file_formats]
+ enum_exr_codec_items = [(e.identifier, e.name, e.description) for e in props_base['exr_codec'].enum_items]
+ enum_color_mode_items = [(e.identifier, e.name, e.description) for e in props_base['color_mode'].enum_items]
file_format = EnumProperty(
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['file_format'].name,
- default=bpy.types.OBJECT_OT_bake.bl_rna.properties['file_format'].default,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['file_format'].description,
+ name=props_base['file_format'].name,
+ default=props_base['file_format'].default,
+ description=props_base['file_format'].description,
items=enum_file_format_items,
)
exr_codec = EnumProperty(
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['exr_codec'].name,
- default=bpy.types.OBJECT_OT_bake.bl_rna.properties['exr_codec'].default,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['exr_codec'].description,
+ name=props_base['exr_codec'].name,
+ default=props_base['exr_codec'].default,
+ description=props_base['exr_codec'].description,
items=enum_exr_codec_items,
)
color_mode = EnumProperty(
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['color_mode'].name,
- default=bpy.types.OBJECT_OT_bake.bl_rna.properties['color_mode'].default,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['color_mode'].description,
+ name=props_base['color_mode'].name,
+ default=props_base['color_mode'].default,
+ description=props_base['color_mode'].description,
items=enum_color_mode_items,
)
color_depth = EnumProperty(
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['color_depth'].name,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['color_depth'].description,
+ name=props_base['color_depth'].name,
+ description=props_base['color_depth'].description,
items=enum_color_depth_items,
)
quality = IntProperty(
subtype='PERCENTAGE',
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['quality'].name,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['quality'].description,
- default=bpy.types.OBJECT_OT_bake.bl_rna.properties['quality'].default,
- soft_min=bpy.types.OBJECT_OT_bake.bl_rna.properties['quality'].soft_min,
- soft_max=bpy.types.OBJECT_OT_bake.bl_rna.properties['quality'].soft_max,
- min=bpy.types.OBJECT_OT_bake.bl_rna.properties['quality'].hard_min,
- max=bpy.types.OBJECT_OT_bake.bl_rna.properties['quality'].hard_max,
+ name=props_base['quality'].name,
+ description=props_base['quality'].description,
+ default=props_base['quality'].default,
+ soft_min=props_base['quality'].soft_min,
+ soft_max=props_base['quality'].soft_max,
+ min=props_base['quality'].hard_min,
+ max=props_base['quality'].hard_max,
)
compression = IntProperty(
subtype='PERCENTAGE',
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['compression'].name,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['compression'].description,
- default=bpy.types.OBJECT_OT_bake.bl_rna.properties['compression'].default,
- soft_min=bpy.types.OBJECT_OT_bake.bl_rna.properties['compression'].soft_min,
- soft_max=bpy.types.OBJECT_OT_bake.bl_rna.properties['compression'].soft_max,
- min=bpy.types.OBJECT_OT_bake.bl_rna.properties['compression'].hard_min,
- max=bpy.types.OBJECT_OT_bake.bl_rna.properties['compression'].hard_max,
+ name=props_base['compression'].name,
+ description=props_base['compression'].description,
+ default=props_base['compression'].default,
+ soft_min=props_base['compression'].soft_min,
+ soft_max=props_base['compression'].soft_max,
+ min=props_base['compression'].hard_min,
+ max=props_base['compression'].hard_max,
)
+ del props_base
+
class CyclesBakeSettings(bpy.types.PropertyGroup):
- enum_normal_space_items = [(e.identifier, e.name, e.description) for e in bpy.types.OBJECT_OT_bake.bl_rna.properties['normal_space'].enum_items]
- enum_normal_swizzle_items = [(e.identifier, e.name, e.description) for e in bpy.types.OBJECT_OT_bake.bl_rna.properties['normal_r'].enum_items]
+ props_base = bpy.types.OBJECT_OT_bake.bl_rna.properties
+
+ enum_normal_space_items = [(e.identifier, e.name, e.description) for e in props_base['normal_space'].enum_items]
+ enum_normal_swizzle_items = [(e.identifier, e.name, e.description) for e in props_base['normal_r'].enum_items]
type = EnumProperty(
name="Type",
@@ -251,8 +257,8 @@ class CyclesBakeSettings(bpy.types.PropertyGroup):
filepath = StringProperty(
subtype='FILE_PATH',
default="//",
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['filepath'].name,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['filepath'].description,
+ name=props_base['filepath'].name,
+ description=props_base['filepath'].description,
)
image_settings = PointerProperty(
@@ -263,35 +269,35 @@ class CyclesBakeSettings(bpy.types.PropertyGroup):
width = IntProperty(
subtype='PIXEL',
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['width'].name,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['width'].description,
- default=bpy.types.OBJECT_OT_bake.bl_rna.properties['width'].default,
- soft_min=bpy.types.OBJECT_OT_bake.bl_rna.properties['width'].soft_min,
- soft_max=bpy.types.OBJECT_OT_bake.bl_rna.properties['width'].soft_max,
- min=bpy.types.OBJECT_OT_bake.bl_rna.properties['width'].hard_min,
- max=bpy.types.OBJECT_OT_bake.bl_rna.properties['width'].hard_max,
+ name=props_base['width'].name,
+ description=props_base['width'].description,
+ default=props_base['width'].default,
+ soft_min=props_base['width'].soft_min,
+ soft_max=props_base['width'].soft_max,
+ min=props_base['width'].hard_min,
+ max=props_base['width'].hard_max,
)
height = IntProperty(
subtype='PIXEL',
- name=bpy.types.OBJECT_OT_bake.bl_rna.properties['height'].name,
- description=bpy.types.OBJECT_OT_bake.bl_rna.properties['height'].description,
- default=bpy.types.OBJECT_OT_bake.bl_rna.properties['height'].default,
- soft_min=bpy.types.OBJECT_OT_bake.bl_rna.properties['height'].soft_min,
- soft_max=bpy.types.OBJECT_OT_bake.bl_rna.properties['height'].soft_max,
- min=bpy.types.OBJECT_OT_bake.bl_rna.properties['height'].hard_min,
- max=bpy.types.OBJECT_OT_bake.bl_rna.properties['height'].hard_max,
+ name=props_base['height'].name,
+ description=props_base['height'].description,
+ default=props_base['height'].default,
+ soft_min=props_base['height'].soft_min,
+ soft_max=props_base['height'].soft_max,
+ min=props_base['height'].hard_min,
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list