[Bf-blender-cvs] [63ba22713ca] greasepencil-object: Fix problem with axis in Local transformations

[Antonio Vazquez]

Commit: 63ba22713caed1e1451747b6a07d9667d0b291e3
Author: Antonio Vazquez
Date:   Thu Aug 24 18:33:20 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB63ba22713caed1e1451747b6a07d9667d0b291e3

Fix problem with axis in Local transformations

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

M	source/blender/editors/transform/transform_conversions.c

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

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 14a92e74737..01e7e594e52 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -7920,7 +7920,9 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 			/* calculate difference matrix */
 			ED_gpencil_parent_location(obact, gpd, gpl, diff_mat);
 			if (t->current_orientation == V3D_MANIP_LOCAL) {
-				unit_m4(diff_mat);
+				if (obact) {
+					copy_m4_m4(diff_mat, obact->obmat);
+				}
 			}
 			/* undo matrix */
 			invert_m4_m4(inverse_diff_mat, diff_mat);