Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-02-23 02:32:58 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-23 02:32:58 +0300
commit97bdfe6f1bbd4413693654362876de6395642da9 (patch)
treeaf90a9730d66c54de01d8add4366eac11fbafbfe /release/scripts/op/object.py
parenta8d364ce4accb900c690229925356ba2ffabdc74 (diff)
pep8 cleanup + correction for external player operator return value.
Diffstat (limited to 'release/scripts/op/object.py')
-rw-r--r--release/scripts/op/object.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/release/scripts/op/object.py b/release/scripts/op/object.py
index 1c0f6d3d9c5..24195b9d152 100644
--- a/release/scripts/op/object.py
+++ b/release/scripts/op/object.py
@@ -336,7 +336,7 @@ class ShapeTransfer(bpy.types.Operator):
self.report({'ERROR'}, "Expected one other selected mesh object to copy from")
return {'CANCELLED'}
ob_act, objects = objects[0], [ob_act]
-
+
if ob_act.type != 'MESH':
self.report({'ERROR'}, "Other object is not a mesh.")
return {'CANCELLED'}
@@ -344,7 +344,7 @@ class ShapeTransfer(bpy.types.Operator):
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.properties.mode, self.properties.use_clamp)
class JoinUVs(bpy.types.Operator):
'''Copy UV Layout to objects with matching geometry'''
@@ -424,7 +424,7 @@ class MakeDupliFace(bpy.types.Operator):
# scale = matrix.median_scale
trans = matrix.translation_part()
rot = matrix.rotation_part() # also contains scale
-
+
return [(rot * b) + trans for b in base_tri]
scene = bpy.context.scene
linked = {}
@@ -444,20 +444,20 @@ class MakeDupliFace(bpy.types.Operator):
mesh.faces.foreach_set("verts_raw", faces)
mesh.update() # generates edge data
- # pick an object to use
+ # pick an object to use
obj = objects[0]
ob_new = bpy.data.objects.new(mesh.name, mesh)
base = scene.objects.link(ob_new)
base.layers[:] = obj.layers
-
+
ob_inst = bpy.data.objects.new(data.name, data)
base = scene.objects.link(ob_inst)
base.layers[:] = obj.layers
-
+
for obj in objects:
scene.objects.unlink(obj)
-
+
ob_new.dupli_type = 'FACES'
ob_inst.parent = ob_new
ob_new.use_dupli_faces_scale = True