Browse Source

Merge remote-tracking branch 'alteredq/unflip' into dev

Mr.doob 13 years ago
parent
commit
068c3729d6

+ 2 - 2
utils/exporters/blender/2.63/scripts/addons/io_mesh_threejs/export_threejs.py

@@ -731,7 +731,7 @@ def generate_indices_and_weights(meshes, option_skinning):
 
 
     armature = bpy.data.armatures[0]
     armature = bpy.data.armatures[0]
 
 
-    for mesh, dummy in meshes:
+    for mesh, object in meshes:
 
 
         i = 0
         i = 0
         mesh_index = -1
         mesh_index = -1
@@ -739,7 +739,7 @@ def generate_indices_and_weights(meshes, option_skinning):
         # find the original object
         # find the original object
 
 
         for obj in bpy.data.objects:
         for obj in bpy.data.objects:
-            if obj.name == mesh.name:
+            if obj.name == mesh.name or obj == object:
                 mesh_index = i
                 mesh_index = i
             i += 1
             i += 1