[Bf-blender-cvs] [58d57a901e4] temp-gpencil-fill: GPencil: Fix merge errors

[Antonio Vazquez]

Commit: 58d57a901e4b10634260c4cd2bce8c72a485d66b
Author: Antonio Vazquez
Date:   Mon Jan 25 16:45:17 2021 +0100
Branches: temp-gpencil-fill
https://developer.blender.org/rB58d57a901e4b10634260c4cd2bce8c72a485d66b

GPencil: Fix merge errors

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

M	source/blender/editors/gpencil/gpencil_fill.c

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

diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 232be02fa14..f873d82d2e7 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -1639,7 +1639,7 @@ static void gpencil_zoom_level_set(tGPDfill *tgpf, const bool is_inverted)
     }
     float diff_mat[4][4];
     /* calculate parent matrix */
-    BKE_gpencil_parent_matrix_get(tgpf->depsgraph, ob, gpl, diff_mat);
+    BKE_gpencil_layer_transform_matrix_get(tgpf->depsgraph, ob, gpl, diff_mat);
 
     /* Decide if the strokes of layers are included or not depending on the layer mode.
      * Cannot skip the layer because it can use boundary strokes and must be used. */