[Bf-blender-cvs] [236577f8f37] greasepencil-object: GPencil: Fix errors after merge

[Antonio Vazquez]

Commit: 236577f8f376950c9274da51d130dc1d59cec329
Author: Antonio Vazquez
Date:   Sat Jan 16 16:11:48 2021 +0100
Branches: greasepencil-object
https://developer.blender.org/rB236577f8f376950c9274da51d130dc1d59cec329

GPencil: Fix errors after merge

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

M	source/blender/io/gpencil/intern/gpencil_io_base.cc
M	source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
M	source/blender/io/gpencil/intern/gpencil_io_export_svg.cc

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

diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 588ee22847a..fbd300697bb 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -368,7 +368,7 @@ struct bGPDlayer *GpencilIO::gpl_current_get(void)
 void GpencilIO::gpl_current_set(struct bGPDlayer *gpl)
 {
   gpl_cur_ = gpl;
-  BKE_gpencil_parent_matrix_get(depsgraph_, params_.ob, gpl, diff_mat_);
+  BKE_gpencil_layer_transform_matrix_get(depsgraph_, params_.ob, gpl, diff_mat_);
 }
 
 struct bGPDframe *GpencilIO::gpf_current_get(void)
@@ -464,7 +464,7 @@ void GpencilIO::selected_objects_boundbox_set(void)
       if (gpl->flag & GP_LAYER_HIDE) {
         continue;
       }
-      BKE_gpencil_parent_matrix_get(depsgraph_, ob_eval, gpl, diff_mat_);
+      BKE_gpencil_layer_transform_matrix_get(depsgraph_, ob_eval, gpl, diff_mat_);
 
       bGPDframe *gpf = gpl->actframe;
       if (gpf == nullptr) {
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
index 5e8e076dcf7..db2b139bc51 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
@@ -177,7 +177,7 @@ void GpencilExporterPDF::export_gpencil_layers(void)
       }
       gpf_current_set(gpf);
 
-      BKE_gpencil_parent_matrix_get(depsgraph_, ob, gpl, diff_mat_);
+      BKE_gpencil_layer_transform_matrix_get(depsgraph_, ob, gpl, diff_mat_);
       LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
         if (gps->totpoints == 0) {
           continue;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
index a860b35d693..ae22f85a4ef 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -206,7 +206,7 @@ void GpencilExporterSVG::export_gpencil_layers(void)
       pugi::xml_node gpl_node = ob_node.append_child("g");
       gpl_node.append_attribute("id").set_value(gpl->info);
 
-      BKE_gpencil_parent_matrix_get(depsgraph_, ob, gpl, diff_mat_);
+      BKE_gpencil_layer_transform_matrix_get(depsgraph_, ob, gpl, diff_mat_);
 
       LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
         if (gps->totpoints == 0) {