[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31866] trunk/blender/release/scripts: Patch [#23759] more replace self.properties.foo --> self. foo for bf-extensions/trunk/py/scripts
Thomas Dinges
dingto at gmx.de
Sat Sep 11 01:39:43 CEST 2010
Revision: 31866
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31866
Author: dingto
Date: 2010-09-11 01:39:43 +0200 (Sat, 11 Sep 2010)
Log Message:
-----------
Patch [#23759] more replace self.properties.foo --> self.foo for bf-extensions/trunk/py/scripts
by Filiciss Muhgue (filiciss). Thanks a lot!
Part 1: Trunk, second part of patch will be committed to Extensions.
Modified Paths:
--------------
trunk/blender/release/scripts/io/netrender/__init__.py
trunk/blender/release/scripts/op/io_mesh_ply/__init__.py
trunk/blender/release/scripts/op/io_scene_fbx/__init__.py
trunk/blender/release/scripts/op/io_scene_obj/__init__.py
trunk/blender/release/scripts/op/io_shape_mdd/__init__.py
trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
Modified: trunk/blender/release/scripts/io/netrender/__init__.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/__init__.py 2010-09-10 20:59:56 UTC (rev 31865)
+++ trunk/blender/release/scripts/io/netrender/__init__.py 2010-09-10 23:39:43 UTC (rev 31866)
@@ -56,5 +56,5 @@
def unregister():
import bpy
- bpy.types.Scene.RemoveProperty("network_render")
+ del bpy.types.Scene.network_render
Modified: trunk/blender/release/scripts/op/io_mesh_ply/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_mesh_ply/__init__.py 2010-09-10 20:59:56 UTC (rev 31865)
+++ trunk/blender/release/scripts/op/io_mesh_ply/__init__.py 2010-09-10 23:39:43 UTC (rev 31866)
@@ -44,21 +44,20 @@
return context.active_object != None
def execute(self, context):
- filepath = self.properties.filepath
+ filepath = self.filepath
filepath = bpy.path.ensure_ext(filepath, self.filename_ext)
import io_mesh_ply.export_ply
return io_mesh_ply.export_ply.save(self, context, **self.properties)
def draw(self, context):
layout = self.layout
- props = self.properties
row = layout.row()
- row.prop(props, "use_modifiers")
- row.prop(props, "use_normals")
+ row.prop(self.properties, "use_modifiers")
+ row.prop(self.properties, "use_normals")
row = layout.row()
- row.prop(props, "use_uv_coords")
- row.prop(props, "use_colors")
+ row.prop(self.properties, "use_uv_coords")
+ row.prop(self.properties, "use_colors")
def menu_func(self, context):
Modified: trunk/blender/release/scripts/op/io_scene_fbx/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_fbx/__init__.py 2010-09-10 20:59:56 UTC (rev 31865)
+++ trunk/blender/release/scripts/op/io_scene_fbx/__init__.py 2010-09-10 23:39:43 UTC (rev 31866)
@@ -69,7 +69,7 @@
def execute(self, context):
import math
from mathutils import Matrix
- if not self.properties.filepath:
+ if not self.filepath:
raise Exception("filepath not set")
mtx4_x90n = Matrix.Rotation(-math.pi / 2.0, 4, 'X')
@@ -77,12 +77,12 @@
mtx4_z90n = Matrix.Rotation(-math.pi / 2.0, 4, 'Z')
GLOBAL_MATRIX = Matrix()
- GLOBAL_MATRIX[0][0] = GLOBAL_MATRIX[1][1] = GLOBAL_MATRIX[2][2] = self.properties.TX_SCALE
- if self.properties.TX_XROT90:
+ GLOBAL_MATRIX[0][0] = GLOBAL_MATRIX[1][1] = GLOBAL_MATRIX[2][2] = self.TX_SCALE
+ if self.TX_XROT90:
GLOBAL_MATRIX = mtx4_x90n * GLOBAL_MATRIX
- if self.properties.TX_YROT90:
+ if self.TX_YROT90:
GLOBAL_MATRIX = mtx4_y90n * GLOBAL_MATRIX
- if self.properties.TX_ZROT90:
+ if self.TX_ZROT90:
GLOBAL_MATRIX = mtx4_z90n * GLOBAL_MATRIX
import io_scene_fbx.export_fbx
Modified: trunk/blender/release/scripts/op/io_scene_obj/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_obj/__init__.py 2010-09-10 20:59:56 UTC (rev 31865)
+++ trunk/blender/release/scripts/op/io_scene_obj/__init__.py 2010-09-10 23:39:43 UTC (rev 31866)
@@ -57,17 +57,17 @@
import io_scene_obj.import_obj
return io_scene_obj.import_obj.load(self, context, **self.properties)
'''
- load_obj(self.properties.filepath,
+ load_obj(self.filepath,
context,
- self.properties.CLAMP_SIZE,
- self.properties.CREATE_FGONS,
- self.properties.CREATE_SMOOTH_GROUPS,
- self.properties.CREATE_EDGES,
- self.properties.SPLIT_OBJECTS,
- self.properties.SPLIT_GROUPS,
- self.properties.ROTATE_X90,
- self.properties.IMAGE_SEARCH,
- self.properties.POLYGROUPS)
+ self.CLAMP_SIZE,
+ self.CREATE_FGONS,
+ self.CREATE_SMOOTH_GROUPS,
+ self.CREATE_EDGES,
+ self.SPLIT_OBJECTS,
+ self.SPLIT_GROUPS,
+ self.ROTATE_X90,
+ self.IMAGE_SEARCH,
+ self.POLYGROUPS)
'''
return {'FINISHED'}
@@ -113,7 +113,7 @@
def execute(self, context):
import io_scene_obj.export_obj
- print(self.properties.keys())
+ print(self.keys())
return io_scene_obj.export_obj.save(self, context, **self.properties)
Modified: trunk/blender/release/scripts/op/io_shape_mdd/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_shape_mdd/__init__.py 2010-09-10 20:59:56 UTC (rev 31865)
+++ trunk/blender/release/scripts/op/io_shape_mdd/__init__.py 2010-09-10 23:39:43 UTC (rev 31866)
@@ -49,8 +49,8 @@
# initialize from scene if unset
scene = context.scene
- if not self.properties.is_property_set("frame_start"):
- self.properties.frame_start = scene.frame_current
+ if not self.frame_start:
+ self.frame_start = scene.frame_current
import io_shape_mdd.import_mdd
return io_shape_mdd.import_mdd.load(self, context, **self.properties)
@@ -83,12 +83,12 @@
def execute(self, context):
# initialize from scene if unset
scene = context.scene
- if not self.properties.is_property_set("frame_start"):
- self.properties.frame_start = scene.frame_start
- if not self.properties.is_property_set("frame_end"):
- self.properties.frame_end = scene.frame_end
- if not self.properties.is_property_set("fps"):
- self.properties.fps = scene.render.fps
+ if not self.frame_start:
+ self.frame_start = scene.frame_start
+ if not self.frame_end:
+ self.frame_end = scene.frame_end
+ if not self.fps:
+ self.fps = scene.render.fps
import io_shape_mdd.export_mdd
return io_shape_mdd.export_mdd.save(self, context, **self.properties)
Modified: trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature_rigify.py 2010-09-10 20:59:56 UTC (rev 31865)
+++ trunk/blender/release/scripts/ui/properties_data_armature_rigify.py 2010-09-10 23:39:43 UTC (rev 31866)
@@ -187,8 +187,8 @@
def execute(self, context):
import rigify
reload(rigify)
- final = (self.properties.metarig_type == "")
- objects = rigify.generate_test(context, metarig_type=self.properties.metarig_type, GENERATE_FINAL=final)
+ final = (self.metarig_type == "")
+ objects = rigify.generate_test(context, metarig_type=self.metarig_type, GENERATE_FINAL=final)
if len(objects) > 1:
for i, (obj_meta, obj_gen) in enumerate(objects):
@@ -238,7 +238,7 @@
reload(rigify_utils)
obj = context.object
code = rigify_utils.write_meta_rig(obj)
- path = self.properties.filepath
+ path = self.filepath
file = open(path, "w")
file.write(code)
file.close()
@@ -248,7 +248,7 @@
def invoke(self, context, event):
import os
obj = context.object
- self.properties.filepath = os.path.splitext(bpy.data.filepath)[0] + "-" + bpy.path.clean_name(obj.name) + ".py"
+ self.filepath = os.path.splitext(bpy.data.filepath)[0] + "-" + bpy.path.clean_name(obj.name) + ".py"
wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
More information about the Bf-blender-cvs
mailing list