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

[Campbell Barton]

Commit: d4249fc739b5c7d5563de66bd7d13568660d49a7
Author: Campbell Barton
Date:   Sun Oct 7 16:36:21 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBAd4249fc739b5c7d5563de66bd7d13568660d49a7

Merge branch 'master' into blender2.8

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



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

diff --cc io_anim_bvh/import_bvh.py
index 154812d5,f62de452..ae283fae
--- a/io_anim_bvh/import_bvh.py
+++ b/io_anim_bvh/import_bvh.py
@@@ -596,11 -616,13 +616,13 @@@ def bvh_node_dict2armature
                  # note that the rot_order_str is reversed.
                  euler = Euler(bvh_rot, bvh_node.rot_order_str[::-1])
                  bone_rotation_matrix = euler.to_matrix().to_4x4()
-                 bone_rotation_matrix = (bone_rest_matrix_inv @
-                                         bone_rotation_matrix @
-                                         bone_rest_matrix)
+                 bone_rotation_matrix = (
 -                    bone_rest_matrix_inv *
 -                    bone_rotation_matrix *
++                    bone_rest_matrix_inv @
++                    bone_rotation_matrix @
+                     bone_rest_matrix
+                 )
  
-                 if 4 == len(rotate[frame_i]):
+                 if len(rotate[frame_i]) == 4:
                      rotate[frame_i] = bone_rotation_matrix.to_quaternion()
                  else:
                      rotate[frame_i] = bone_rotation_matrix.to_euler(