[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1566] trunk/py/scripts/addons: patch [ #25979] fixes for addons/io_scene_fbx, io_scene_x3d
Campbell Barton
ideasman42 at gmail.com
Thu Feb 10 01:10:24 CET 2011
Revision: 1566
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1566
Author: campbellbarton
Date: 2011-02-10 00:10:20 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
patch [#25979] fixes for addons/io_scene_fbx, io_scene_x3d
from Filiciss Muhgue (filiciss)
fixes [#25997] Export to X3D reports error TypeError: 'NoneType' object is not scriptable.
Modified Paths:
--------------
trunk/py/scripts/addons/io_scene_fbx/__init__.py
trunk/py/scripts/addons/io_scene_fbx/export_fbx.py
trunk/py/scripts/addons/io_scene_x3d/__init__.py
trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
Modified: trunk/py/scripts/addons/io_scene_fbx/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_fbx/__init__.py 2011-02-09 09:18:13 UTC (rev 1565)
+++ trunk/py/scripts/addons/io_scene_fbx/__init__.py 2011-02-10 00:10:20 UTC (rev 1566)
@@ -21,6 +21,8 @@
bl_info = {
"name": "Autodesk FBX format",
"author": "Campbell Barton",
+ "blender": (2, 5, 6),
+ "api": 34647,
"location": "File > Import-Export",
"description": "Import-Export FBX meshes, UV's, vertex colors, materials, textures, cameras and lamps",
"warning": "",
Modified: trunk/py/scripts/addons/io_scene_fbx/export_fbx.py
===================================================================
--- trunk/py/scripts/addons/io_scene_fbx/export_fbx.py 2011-02-09 09:18:13 UTC (rev 1565)
+++ trunk/py/scripts/addons/io_scene_fbx/export_fbx.py 2011-02-10 00:10:20 UTC (rev 1566)
@@ -469,8 +469,8 @@
#return mtx4_z90 * (self.getPoseMatrix(frame) * arm_mat) # dont apply arm matrix anymore
return self.getPoseMatrix(frame) * mtx4_z90
else:
- #return (mtx4_z90 * ((self.getPoseMatrix(frame) * arm_mat))) * (mtx4_z90 * (self.parent.getPoseMatrix(frame) * arm_mat)).invert()
- return (self.parent.getPoseMatrix(frame) * mtx4_z90).invert() * ((self.getPoseMatrix(frame)) * mtx4_z90)
+ #return (mtx4_z90 * ((self.getPoseMatrix(frame) * arm_mat))) * (mtx4_z90 * (self.parent.getPoseMatrix(frame) * arm_mat)).inverted()
+ return (self.parent.getPoseMatrix(frame) * mtx4_z90).inverted() * ((self.getPoseMatrix(frame)) * mtx4_z90)
# we need thes because cameras and lights modified rotations
def getAnimParRelMatrixRot(self, frame):
@@ -527,14 +527,14 @@
def getAnimParRelMatrix(self, frame):
if self.fbxParent:
#return (self.__anim_poselist[frame] * self.fbxParent.__anim_poselist[frame].inverted() ) * GLOBAL_MATRIX
- return (GLOBAL_MATRIX * self.fbxParent.__anim_poselist[frame]).invert() * (GLOBAL_MATRIX * self.__anim_poselist[frame])
+ return (GLOBAL_MATRIX * self.fbxParent.__anim_poselist[frame]).inverted() * (GLOBAL_MATRIX * self.__anim_poselist[frame])
else:
return GLOBAL_MATRIX * self.__anim_poselist[frame]
def getAnimParRelMatrixRot(self, frame):
obj_type = self.blenObject.type
if self.fbxParent:
- matrix_rot = ((GLOBAL_MATRIX * self.fbxParent.__anim_poselist[frame]).invert() * (GLOBAL_MATRIX * self.__anim_poselist[frame])).to_3x3()
+ matrix_rot = ((GLOBAL_MATRIX * self.fbxParent.__anim_poselist[frame]).inverted() * (GLOBAL_MATRIX * self.__anim_poselist[frame])).to_3x3()
else:
matrix_rot = (GLOBAL_MATRIX * self.__anim_poselist[frame]).to_3x3()
@@ -1441,7 +1441,7 @@
#m = mtx4_z90 * my_bone.restMatrix
matstr = mat4x4str(m)
- matstr_i = mat4x4str(m.invert())
+ matstr_i = mat4x4str(m.inverted())
file.write('\n\t\tTransform: %s' % matstr_i) # THIS IS __NOT__ THE GLOBAL MATRIX AS DOCUMENTED :/
file.write('\n\t\tTransformLink: %s' % matstr)
Modified: trunk/py/scripts/addons/io_scene_x3d/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/__init__.py 2011-02-09 09:18:13 UTC (rev 1565)
+++ trunk/py/scripts/addons/io_scene_x3d/__init__.py 2011-02-10 00:10:20 UTC (rev 1566)
@@ -22,7 +22,7 @@
"name": "Web3D X3D/VRML format",
"author": "Campbell Barton, Bart",
"blender": (2, 5, 6),
- "api": 34386,
+ "api": 34647,
"location": "File > Import-Export",
"description": "Import-Export X3D, Import VRML",
"warning": "",
Modified: trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/export_x3d.py 2011-02-09 09:18:13 UTC (rev 1565)
+++ trunk/py/scripts/addons/io_scene_x3d/export_x3d.py 2011-02-10 00:10:20 UTC (rev 1566)
@@ -47,7 +47,7 @@
def matrix_direction(mtx):
- return (mathutils.Vector((0.0, 0.0, -1.0)) * mtx.to_3x3()).normalize()[:]
+ return (mathutils.Vector((0.0, 0.0, -1.0)) * mtx.to_3x3()).normalized()[:]
##########################################################
More information about the Bf-extensions-cvs
mailing list