[Bf-extensions-cvs] [03696408] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 03696408e323625519bc7961cbcc2ae35b326b5a
Author: Campbell Barton
Date:   Sun Oct 7 16:14:22 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBA03696408e323625519bc7961cbcc2ae35b326b5a

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc io_anim_bvh/__init__.py
index 419b6e8e,4a4983ff..dd9c2037
--- a/io_anim_bvh/__init__.py
+++ b/io_anim_bvh/__init__.py
@@@ -213,10 -220,10 +216,17 @@@ class ExportBVH(bpy.types.Operator, Exp
              self.frame_start = context.scene.frame_start
              self.frame_end = context.scene.frame_end
  
--        keywords = self.as_keywords(ignore=("check_existing", "filter_glob"))
++        keywords = self.as_keywords(
++            ignore=(
++                "axis_forward",
++                "axis_up",
++                "check_existing",
++                "filter_glob",
++            )
++        )
  
          from . import export_bvh
-         return export_bvh.save(self, context, **keywords)
+         return export_bvh.save(context, **keywords)
  
  
  def menu_func_import(self, context):
diff --cc io_anim_bvh/export_bvh.py
index 503ffa68,21225581..2815fe35
--- a/io_anim_bvh/export_bvh.py
+++ b/io_anim_bvh/export_bvh.py
@@@ -244,13 -254,13 +254,13 @@@ def write_armature
              trans = Matrix.Translation(dbone.rest_bone.head_local)
              itrans = Matrix.Translation(-dbone.rest_bone.head_local)
  
-             if  dbone.parent:
+             if dbone.parent:
 -                mat_final = dbone.parent.rest_arm_mat * dbone.parent.pose_imat * dbone.pose_mat * dbone.rest_arm_imat
 -                mat_final = itrans * mat_final * trans
 +                mat_final = dbone.parent.rest_arm_mat @ dbone.parent.pose_imat @ dbone.pose_mat @ dbone.rest_arm_imat
 +                mat_final = itrans @ mat_final @ trans
                  loc = mat_final.to_translation() + (dbone.rest_bone.head_local - dbone.parent.rest_bone.head_local)
              else:
 -                mat_final = dbone.pose_mat * dbone.rest_arm_imat
 -                mat_final = itrans * mat_final * trans
 +                mat_final = dbone.pose_mat @ dbone.rest_arm_imat
 +                mat_final = itrans @ mat_final @ trans
                  loc = mat_final.to_translation() + dbone.rest_bone.head
  
              # keep eulers compatible, no jumping on interpolation.
diff --cc io_anim_bvh/import_bvh.py
index db04acb8,a12ef0cc..154812d5
--- a/io_anim_bvh/import_bvh.py
+++ b/io_anim_bvh/import_bvh.py
@@@ -537,8 -561,8 +561,8 @@@ def bvh_node_dict2armature
                  bvh_loc = bvh_node.anim_data[frame_i + skip_frame][:3]
  
                  bone_translate_matrix = Matrix.Translation(
-                         Vector(bvh_loc) - bvh_node.rest_head_local)
+                     Vector(bvh_loc) - bvh_node.rest_head_local)
 -                location[frame_i] = (bone_rest_matrix_inv *
 +                location[frame_i] = (bone_rest_matrix_inv @
                                       bone_translate_matrix).to_translation()
  
              # For each location x, y, z.