[Bf-blender-cvs] [b9a056e25f9] temp-gpencil-io: Rename function to clarify use
Antonio Vazquez
noreply at git.blender.org
Tue Mar 23 15:15:57 CET 2021
Commit: b9a056e25f90daae5ca593fac37dc8d959941923
Author: Antonio Vazquez
Date: Tue Mar 23 15:15:53 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rBb9a056e25f90daae5ca593fac37dc8d959941923
Rename function to clarify use
===================================================================
M source/blender/io/gpencil/intern/gpencil_io_base.cc
M source/blender/io/gpencil/intern/gpencil_io_base.h
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 77ac035ebe3..2d463aac24f 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -306,13 +306,13 @@ float GpencilIO::stroke_point_radius_get(bGPDlayer *gpl, struct bGPDstroke *gps)
return MAX2(radius, 1.0f);
}
-void GpencilIO::gpl_prepare_export_matrix(struct Object *ob, struct bGPDlayer *gpl)
+void GpencilIO::prepare_layer_export_matrix(struct Object *ob, struct bGPDlayer *gpl)
{
BKE_gpencil_layer_transform_matrix_get(depsgraph_, ob, gpl, diff_mat_);
mul_m4_m4m4(diff_mat_, diff_mat_, gpl->layer_invmat);
}
-void GpencilIO::gps_prepare_export_colors(struct Object *ob, struct bGPDstroke *gps)
+void GpencilIO::prepare_stroke_export_colors(struct Object *ob, struct bGPDstroke *gps)
{
MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(ob, gps->mat_nr + 1);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index 88c988f9db1..10e3d9dfd14 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -99,8 +99,8 @@ class GpencilIO {
float stroke_average_opacity_get();
- void gpl_prepare_export_matrix(struct Object *ob, struct bGPDlayer *gpl);
- void gps_prepare_export_colors(struct Object *ob, struct bGPDstroke *gps);
+ void prepare_layer_export_matrix(struct Object *ob, struct bGPDlayer *gpl);
+ void prepare_stroke_export_colors(struct Object *ob, struct bGPDstroke *gps);
void selected_objects_boundbox_calc();
void selected_objects_boundbox_get(rctf *boundbox);
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 82bfa58f5d4..ad6be55f5e4 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
@@ -166,7 +166,7 @@ void GpencilExporterPDF::export_gpencil_layers()
if (gpl->flag & GP_LAYER_HIDE) {
continue;
}
- gpl_prepare_export_matrix(ob, gpl);
+ prepare_layer_export_matrix(ob, gpl);
bGPDframe *gpf = gpl->actframe;
if ((gpf == nullptr) || (gpf->strokes.first == nullptr)) {
@@ -189,7 +189,7 @@ void GpencilExporterPDF::export_gpencil_layers()
(gp_style->stroke_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
const bool is_fill = ((gp_style->flag & GP_MATERIAL_FILL_SHOW) &&
(gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
- gps_prepare_export_colors(ob, gps_duplicate);
+ prepare_stroke_export_colors(ob, gps_duplicate);
/* Apply layer thickness change. */
gps_duplicate->thickness += gpl->line_change;
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 e9a8314e2f0..70482b45a5e 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -184,7 +184,7 @@ void GpencilExporterSVG::export_gpencil_layers()
if (gpl->flag & GP_LAYER_HIDE) {
continue;
}
- gpl_prepare_export_matrix(ob, gpl);
+ prepare_layer_export_matrix(ob, gpl);
bGPDframe *gpf = gpl->actframe;
if ((gpf == nullptr) || (gpf->strokes.first == nullptr)) {
@@ -218,7 +218,7 @@ void GpencilExporterSVG::export_gpencil_layers()
const bool is_fill = ((gp_style->flag & GP_MATERIAL_FILL_SHOW) &&
(gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
- gps_prepare_export_colors(ob, gps_duplicate);
+ prepare_stroke_export_colors(ob, gps_duplicate);
/* Apply layer thickness change. */
gps_duplicate->thickness += gpl->line_change;
More information about the Bf-blender-cvs
mailing list