[Bf-extensions-cvs] [5b18c3f4] blender-v2.81-release: Rigify: fix T70841 - bad bone placement when the metarig object is moved.

[Alexander Gavrilov]

Commit: 5b18c3f4acb23fe26e12b6c4d425a79c0a8a61e6
Author: Alexander Gavrilov
Date:   Tue Oct 15 16:59:53 2019 +0300
Branches: blender-v2.81-release
https://developer.blender.org/rBA5b18c3f4acb23fe26e12b6c4d425a79c0a8a61e6

Rigify: fix T70841 - bad bone placement when the metarig object is moved.

Match object orientations during join, as suggested by @pioverfour.

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

M	rigify/generate.py

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

diff --git a/rigify/generate.py b/rigify/generate.py
index 88b216ed..e0da3b00 100644
--- a/rigify/generate.py
+++ b/rigify/generate.py
@@ -156,8 +156,13 @@ class Generator(base_generate.BaseGenerator):
         # Select the target rig and join
         select_object(context, obj)
 
+        saved_matrix = obj.matrix_world.copy()
+        obj.matrix_world = metarig.matrix_world
+
         bpy.ops.object.join()
 
+        obj.matrix_world = saved_matrix
+
         # Select the generated rig
         select_object(context, obj, deselect_all=True)