[Bf-blender-cvs] [b3338f900cb] greasepencil-object: GPencil: Use Layer Transform in Export to SVG and PDF
Antonio Vazquez
noreply at git.blender.org
Sun Jan 17 13:07:27 CET 2021
Commit: b3338f900cb7d4a637bc9d8c165d2e1727b99006
Author: Antonio Vazquez
Date: Sun Jan 17 13:07:20 2021 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb3338f900cb7d4a637bc9d8c165d2e1727b99006
GPencil: Use Layer Transform in Export to SVG and PDF
Also, removed a double calculation of the layer transform matrix.
===================================================================
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 fbd300697bb..fe50459c470 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -369,6 +369,7 @@ void GpencilIO::gpl_current_set(struct bGPDlayer *gpl)
{
gpl_cur_ = gpl;
BKE_gpencil_layer_transform_matrix_get(depsgraph_, params_.ob, gpl, diff_mat_);
+ mul_m4_m4m4(diff_mat_, diff_mat_, gpl->layer_invmat);
}
struct bGPDframe *GpencilIO::gpf_current_get(void)
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 db2b139bc51..7215f7e1965 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,6 @@ void GpencilExporterPDF::export_gpencil_layers(void)
}
gpf_current_set(gpf);
- 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 ae22f85a4ef..d19d0668028 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -206,8 +206,6 @@ 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_layer_transform_matrix_get(depsgraph_, ob, gpl, diff_mat_);
-
LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
if (gps->totpoints == 0) {
continue;
More information about the Bf-blender-cvs
mailing list