Pārlūkot izejas kodu

Merge pull request #1327 from Palmer-JC/master

Blender Exporter 5.0.3
David Catuhe 9 gadi atpakaļ
vecāks
revīzija
c30858e234

BIN
Exporters/Blender/Blender2Babylon-5.0.zip


+ 1 - 1
Exporters/Blender/src/__init__.py

@@ -1,7 +1,7 @@
 bl_info = {
     'name': 'Babylon.js',
     'author': 'David Catuhe, Jeff Palmer',
-    'version': (5, 0, 2),
+    'version': (5, 0, 3),
     'blender': (2, 76, 0),
     'location': 'File > Export > Babylon.js (.babylon)',
     'description': 'Export Babylon.js scenes (.babylon)',

+ 3 - 3
Exporters/Blender/src/mesh.py

@@ -88,9 +88,9 @@ class Mesh(FCurveAnimatable):
             self.scaling  = Vector((1, 1, 1))
             
         # ensure no unapplied rotation or scale, when there is an armature
-        self.hasUnappliedTransforms = (self.scaling .x != 1 or self.scaling .y != 1 or self.scaling .z != 1 or
-                self.rotation.x != 0 or self.rotation.y != 0 or self.rotation.z != 0 or 
-                (object.rotation_mode == 'QUATERNION' and self.rotation.w != 1)
+        self.hasUnappliedTransforms = (scale.x != 1 or scale.y != 1 or scale.z != 1 or
+                (hasattr(self, 'rotation'          ) and (self.rotation          .x != 0 or self.rotation          .y != 0 or self.rotation          .z != 0)) or 
+                (hasattr(self, 'rotationQuaternion') and (self.rotationQuaternion.x != 0 or self.rotationQuaternion.y != 0 or self.rotationQuaternion.z != 0 or self.rotationQuaternion.w != 1))
                 )
 
         # determine parent & dataName

+ 2 - 1
Exporters/Blender/src/package_level.py

@@ -1,5 +1,6 @@
 from sys import modules
 from math import floor
+from mathutils import Euler, Matrix
 
 from bpy import app
 from time import strftime
@@ -181,7 +182,7 @@ def format_bool(bool):
         return 'false'
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 def post_rotate_quaternion(quat, angle):
-    post = mathutils.Euler((angle, 0.0, 0.0)).to_matrix()
+    post = Euler((angle, 0.0, 0.0)).to_matrix()
     mqtn = quat.to_matrix()
     quat = (mqtn*post).to_quaternion()
     return quat