fix for make-dupli-face operator & vector multiplication, tab/space error in last commit.

3 files changed, 4 insertions, 4 deletions

diff --git a/release/scripts/op/object.py b/release/scripts/op/object.py
index ffd40b9a9bd..01e6a5f3cd0 100644
--- a/release/scripts/op/object.py
+++ b/release/scripts/op/object.py
@@ -467,7 +467,7 @@ class JoinUVs(bpy.types.Operator):
 class MakeDupliFace(bpy.types.Operator):
     '''Make linked objects into dupli-faces'''
     bl_idname = "object.make_dupli_face"
-    bl_label = "Make DupliFace"
+    bl_label = "Make Dupli-Face"
 
     @classmethod
     def poll(cls, context):
@@ -487,7 +487,7 @@ class MakeDupliFace(bpy.types.Operator):
             trans = matrix.translation_part()
             rot = matrix.rotation_part()  # also contains scale
 
-            return [(rot * b) + trans for b in base_tri]
+            return [(b * rot) + trans for b in base_tri]
         scene = bpy.context.scene
         linked = {}
         for obj in bpy.context.selected_objects:
diff --git a/release/scripts/op/object_align.py b/release/scripts/op/object_align.py
index 045be5e80b8..fc2c9b2731f 100644
--- a/release/scripts/op/object_align.py
+++ b/release/scripts/op/object_align.py
@@ -35,7 +35,7 @@ def align_objects(align_x, align_y, align_z, align_mode, relative_to):
 
     for obj in bpy.context.selected_objects:
         matrix_world = obj.matrix_world
-		bb_world = [Vector(v[:]) * matrix_world for v in obj.bound_box]
+        bb_world = [Vector(v[:]) * matrix_world for v in obj.bound_box]
         objs.append((obj, bb_world))
 
     if not objs:
diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py
index 3a3a526dab5..73e142f530b 100644
--- a/release/scripts/ui/space_view3d.py
+++ b/release/scripts/ui/space_view3d.py
@@ -676,7 +676,7 @@ class VIEW3D_MT_object(bpy.types.Menu):
         layout.operator("object.delete", text="Delete...")
         layout.operator("object.proxy_make", text="Make Proxy...")
         layout.menu("VIEW3D_MT_make_links", text="Make Links...")
-        layout.operator("object.make_dupli_face", text="Make Dupliface...")
+        layout.operator("object.make_dupli_face")
         layout.operator_menu_enum("object.make_local", "type", text="Make Local...")
         layout.menu("VIEW3D_MT_make_single_user")