Merge pull request #484 from HENDRIX-ZT2/develop

Pull out nifformat_to_mathutils_matrix, improve comment

Author: HENDRIX-ZT2

io_scene_niftools/modules/nif_import/armature/__init__.py

@@ -220,9 +220,9 @@ def import_armature(self, n_armature):
         for b_name, n_block in self.name_to_block.items():
             n_pose = self.pose_store[n_block]
             b_pose_bone = b_armature_obj.pose.bones[b_name]
-            n_bind = mathutils.Matrix(n_pose.as_list()).transposed()
+            n_bind = math.nifformat_to_mathutils_matrix(n_pose)
             b_pose_bone.matrix = math.nif_bind_to_blender_bind(n_bind)
-            # force update is required to ensure the transforms are set properly in blender
+            # force update is required after each pbone to ensure the transforms are set properly in blender
             bpy.context.view_layer.update()
 
         return b_armature_obj
@@ -239,7 +239,7 @@ def import_bone_bind(self, n_block, b_armature_data, n_armature, b_parent_bone=N
         # store nif block for access from object mode
         self.name_to_block[b_edit_bone.name] = n_block
         # get the nif bone's armature space matrix (under the hood all bone space matrixes are multiplied together)
-        n_bind = mathutils.Matrix(self.bind_store.get(n_block, NifFormat.Matrix44()).as_list()).transposed()
+        n_bind = math.nifformat_to_mathutils_matrix(self.bind_store.get(n_block, NifFormat.Matrix44()))
         # get transformation in blender's coordinate space
         b_bind = math.nif_bind_to_blender_bind(n_bind)
 

io_scene_niftools/utils/math.py

@@ -110,7 +110,7 @@ def nif_bind_to_blender_bind(nif_armature_space_matrix):
 
 def import_matrix(n_block, relative_to=None):
     """Retrieves a n_block's transform matrix as a Mathutil.Matrix."""
-    return mathutils.Matrix(n_block.get_transform(relative_to).as_list()).transposed()
+    return nifformat_to_mathutils_matrix(n_block.get_transform(relative_to))
 
 
 def decompose_srt(b_matrix):
@@ -242,3 +242,8 @@ def mathutils_to_nifformat_matrix(b_matrix):
     n_matrix.set_rows(*b_matrix.transposed())
     return n_matrix
 
+
+def nifformat_to_mathutils_matrix(n_matrix):
+    """Convert a NifFormat.Matrix44 to a blender matrix"""
+    return mathutils.Matrix(n_matrix.as_list()).transposed()
+