[Bf-blender-cvs] [3ac8b9c85ee] greasepencil-object: GPencil: Cleanup matrix multiplication

[Antonio Vazquez]

Commit: 3ac8b9c85ee62abbc4aef8c258e0da6b581cc496
Author: Antonio Vazquez
Date:   Tue Mar 17 16:46:45 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB3ac8b9c85ee62abbc4aef8c258e0da6b581cc496

GPencil: Cleanup matrix multiplication

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

M	source/blender/blenkernel/intern/gpencil.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index aa16b9b3f21..0be92b7533d 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -4047,8 +4047,10 @@ void BKE_gpencil_update_layer_parent(const Depsgraph *depsgraph, Object *ob)
         bPoseChannel *pchan = BKE_pose_channel_find_name(ob_parent->pose, gpl->parsubstr);
         if (pchan != NULL) {
           copy_m4_m4(cur_mat, ob->imat);
-          mul_m4_m4m4(cur_mat, cur_mat, ob_parent->obmat);
-          mul_m4_m4m4(cur_mat, cur_mat, pchan->pose_mat);
+          mul_m4_m4m4(cur_mat, ob_parent->obmat, pchan->pose_mat);
+        }
+        else {
+          unit_m4(cur_mat);
         }
       }
       /* only redo if any change */