[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31848] trunk/blender/release/scripts: replace self.properties.foo --> self.foo
Campbell Barton
ideasman42 at gmail.com
Thu Sep 9 20:03:58 CEST 2010
Revision: 31848
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31848
Author: campbellbarton
Date: 2010-09-09 20:03:57 +0200 (Thu, 09 Sep 2010)
Log Message:
-----------
replace self.properties.foo --> self.foo
Modified Paths:
--------------
trunk/blender/release/scripts/modules/io_utils.py
trunk/blender/release/scripts/op/add_mesh_torus.py
trunk/blender/release/scripts/op/image.py
trunk/blender/release/scripts/op/nla.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/object_align.py
trunk/blender/release/scripts/op/object_randomize_transform.py
trunk/blender/release/scripts/op/presets.py
trunk/blender/release/scripts/op/sequencer.py
trunk/blender/release/scripts/op/uv.py
trunk/blender/release/scripts/op/uvcalc_smart_project.py
trunk/blender/release/scripts/op/vertexpaint_dirt.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/operator.py
trunk/blender/release/scripts/templates/operator_modal.py
trunk/blender/release/scripts/templates/operator_modal_view3d.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/space_console.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_userpref_keymap.py
Modified: trunk/blender/release/scripts/modules/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/io_utils.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/modules/io_utils.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ -28,8 +28,8 @@
def invoke(self, context, event):
import os
- if not self.properties.is_property_set("filepath"):
- self.properties.filepath = os.path.splitext(context.blend_data.filepath)[0] + self.filename_ext
+ if not self.filepath:
+ self.filepath = os.path.splitext(context.blend_data.filepath)[0] + self.filename_ext
context.window_manager.add_fileselect(self)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/op/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/op/add_mesh_torus.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/op/add_mesh_torus.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ -107,17 +107,16 @@
rotation = FloatVectorProperty(name="Rotation")
def execute(self, context):
- props = self.properties
- if props.use_abso == True:
- extra_helper = (props.abso_major_rad - props.abso_minor_rad) * 0.5
- props.major_radius = props.abso_minor_rad + extra_helper
- props.minor_radius = extra_helper
+ if self.use_abso == True:
+ extra_helper = (self.abso_major_rad - self.abso_minor_rad) * 0.5
+ self.major_radius = self.abso_minor_rad + extra_helper
+ self.minor_radius = extra_helper
- verts_loc, faces = add_torus(props.major_radius,
- props.minor_radius,
- props.major_segments,
- props.minor_segments)
+ verts_loc, faces = add_torus(self.major_radius,
+ self.minor_radius,
+ self.major_segments,
+ self.minor_segments)
mesh = bpy.data.meshes.new("Torus")
Modified: trunk/blender/release/scripts/op/image.py
===================================================================
--- trunk/blender/release/scripts/op/image.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/op/image.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ -58,7 +58,7 @@
def execute(self, context):
import os
import subprocess
- filepath = bpy.path.abspath(self.properties.filepath)
+ filepath = bpy.path.abspath(self.filepath)
if not os.path.exists(filepath):
self.report('ERROR', "Image path '%s' not found." % filepath)
@@ -77,7 +77,7 @@
self.report({'ERROR'}, "Image not found on disk")
return {'CANCELLED'}
- self.properties.filepath = filepath
+ self.filepath = filepath
self.execute(context)
return {'FINISHED'}
Modified: trunk/blender/release/scripts/op/nla.py
===================================================================
--- trunk/blender/release/scripts/op/nla.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/op/nla.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ -148,9 +148,8 @@
default=True)
def execute(self, context):
- props = self.properties
- action = bake(props.frame_start, props.frame_end, props.step, props.show_only_selected)
+ action = bake(self.frame_start, self.frame_end, self.step, self.show_only_selected)
# basic cleanup, could move elsewhere
for fcu in action.fcurves:
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/op/object.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ -36,7 +36,7 @@
import fnmatch
- if self.properties.case_sensitive:
+ if self.case_sensitive:
pattern_match = fnmatch.fnmatchcase
else:
pattern_match = lambda a, b: fnmatch.fnmatchcase(a.upper(), b.upper())
@@ -51,9 +51,9 @@
# Can be pose bones or objects
for item in items:
- if pattern_match(item.name, self.properties.pattern):
+ if pattern_match(item.name, self.pattern):
item.select = True
- elif not self.properties.extend:
+ elif not self.extend:
item.select = False
return {'FINISHED'}
@@ -66,12 +66,11 @@
def draw(self, context):
layout = self.layout
- props = self.properties
- layout.prop(props, "pattern")
+ layout.prop(self.properties, "pattern")
row = layout.row()
- row.prop(props, "case_sensitive")
- row.prop(props, "extend")
+ row.prop(self.properties, "case_sensitive")
+ row.prop(self.properties, "extend")
class SelectCamera(bpy.types.Operator):
@@ -124,7 +123,7 @@
if context.object not in selected_objects:
selected_objects.append(context.object)
- if self.properties.direction == 'PARENT':
+ if self.direction == 'PARENT':
for obj in selected_objects:
parent = obj.parent
@@ -144,7 +143,7 @@
# dont edit any object settings above this
if select_new:
- if not self.properties.extend:
+ if not self.extend:
bpy.ops.object.select_all(action='DESELECT')
for obj in select_new:
@@ -174,8 +173,8 @@
return (obs is not None)
def execute(self, context):
- level = self.properties.level
- relative = self.properties.relative
+ level = self.level
+ relative = self.relative
if relative and level == 0:
return {'CANCELLED'} # nothing to do
@@ -403,7 +402,7 @@
if ob_act.active_shape_key is None:
self.report({'ERROR'}, "Other object has no shape key")
return {'CANCELLED'}
- return self._main(ob_act, objects, self.properties.mode, self.properties.use_clamp)
+ return self._main(ob_act, objects, self.mode, self.use_clamp)
class JoinUVs(bpy.types.Operator):
Modified: trunk/blender/release/scripts/op/object_align.py
===================================================================
--- trunk/blender/release/scripts/op/object_align.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/op/object_align.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ -268,15 +268,8 @@
return context.mode == 'OBJECT'
def execute(self, context):
+ align_objects(self.align_x, self.align_y, self.align_z, self.align_mode, self.relative_to)
- align_mode = self.properties.align_mode
- relative_to = self.properties.relative_to
- align_x = self.properties.align_x
- align_y = self.properties.align_y
- align_z = self.properties.align_z
-
- align_objects(align_x, align_y, align_z, align_mode, relative_to)
-
return {'FINISHED'}
Modified: trunk/blender/release/scripts/op/object_randomize_transform.py
===================================================================
--- trunk/blender/release/scripts/op/object_randomize_transform.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/op/object_randomize_transform.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ -119,14 +119,14 @@
def execute(self, context):
from math import radians
- seed = self.properties.random_seed
+ seed = self.random_seed
- loc = None if not self.properties.use_loc else self.properties.loc
- rot = None if not self.properties.use_rot else self.properties.rot * radians(1.0)
- scale = None if not self.properties.use_scale else self.properties.scale
+ loc = None if not self.use_loc else self.loc
+ rot = None if not self.use_rot else self.rot * radians(1.0)
+ scale = None if not self.use_scale else self.scale
- scale_even = self.properties.scale_even
- scale_min = self.properties.scale_min
+ scale_even = self.scale_even
+ scale_min = self.scale_min
randomize_selected(seed, loc, rot, scale, scale_even, scale_min)
Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/op/presets.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ -39,16 +39,16 @@
def execute(self, context):
- if not self.properties.name:
+ if not self.name:
return {'FINISHED'}
- filename = self._as_filename(self.properties.name) + ".py"
+ filename = self._as_filename(self.name) + ".py"
target_path = bpy.utils.preset_paths(self.preset_subdir)[0] # we need some way to tell the user and system preset path
filepath = os.path.join(target_path, filename)
if getattr(self, "save_keyconfig", False):
- bpy.ops.wm.keyconfig_export(filepath=filepath, kc_name=self.properties.name)
+ bpy.ops.wm.keyconfig_export(filepath=filepath, kc_name=self.name)
file_preset = open(filepath, 'a')
file_preset.write("wm.keyconfigs.active = kc\n\n")
else:
@@ -83,11 +83,11 @@
def execute(self, context):
# change the menu title to the most recently chosen option
- preset_class = getattr(bpy.types, self.properties.menu_idname)
- preset_class.bl_label = self.properties.preset_name
+ preset_class = getattr(bpy.types, self.menu_idname)
+ preset_class.bl_label = self.preset_name
# execute the preset using script.python_file_run
- bpy.ops.script.python_file_run(filepath=self.properties.filepath)
+ bpy.ops.script.python_file_run(filepath=self.filepath)
return {'FINISHED'}
Modified: trunk/blender/release/scripts/op/sequencer.py
===================================================================
--- trunk/blender/release/scripts/op/sequencer.py 2010-09-09 17:41:36 UTC (rev 31847)
+++ trunk/blender/release/scripts/op/sequencer.py 2010-09-09 18:03:57 UTC (rev 31848)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list