[Bf-blender-cvs] [5f87e343ff1] greasepencil-object: GPencil: Rename export functions
Antonio Vazquez
noreply at git.blender.org
Mon Jul 27 23:01:16 CEST 2020
Commit: 5f87e343ff1b614f2a9afa948ae5432e4e588b73
Author: Antonio Vazquez
Date: Mon Jul 27 23:01:07 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5f87e343ff1b614f2a9afa948ae5432e4e588b73
GPencil: Rename export functions
===================================================================
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_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 773329e80af..46cec62b923 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -99,7 +99,7 @@ bool GpencilExporter::gpencil_3d_point_to_screen_space(struct ARegion *region,
* \param gps: Pointer to stroke
* \retun value
*/
-float GpencilExporter::stroke_average_pressure(struct bGPDstroke *gps)
+float GpencilExporter::stroke_average_pressure_get(struct bGPDstroke *gps)
{
bGPDspoint *pt = NULL;
@@ -141,9 +141,9 @@ bool GpencilExporter::is_stroke_thickness_constant(struct bGPDstroke *gps)
return true;
}
-float GpencilExporter::point_radius(const struct bGPDlayer *gpl,
- struct bGPDstroke *gps,
- float diff_mat[4][4])
+float GpencilExporter::stroke_point_radius_get(const struct bGPDlayer *gpl,
+ struct bGPDstroke *gps,
+ float diff_mat[4][4])
{
RegionView3D *rv3d = (RegionView3D *)params.region->regiondata;
bGPDspoint *pt = NULL;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index 31a31c2080d..603f08901c9 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -51,8 +51,10 @@ class GpencilExporter {
float r_co[2]);
bool is_stroke_thickness_constant(struct bGPDstroke *gps);
- float stroke_average_pressure(struct bGPDstroke *gps);
- float point_radius(const struct bGPDlayer *gpl, struct bGPDstroke *gps, float diff_mat[4][4]);
+ float stroke_average_pressure_get(struct bGPDstroke *gps);
+ float stroke_point_radius_get(const struct bGPDlayer *gpl,
+ struct bGPDstroke *gps,
+ float diff_mat[4][4]);
std::string rgb_to_hex(float color[3]);
std::string to_lower_string(char *input_text);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
index 0afa8165e39..eeb8732e147 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
@@ -374,7 +374,7 @@ void GpencilExporterSVG::export_stroke_polyline(pugi::xml_node gpl_node,
bGPDspoint *pt = &gps->points[0];
float avg_pressure = pt->pressure;
if (!is_thickness_const) {
- avg_pressure = stroke_average_pressure(gps);
+ avg_pressure = stroke_average_pressure_get(gps);
}
/* Get the thickness in pixels using a simple 1 point stroke. */
@@ -386,7 +386,7 @@ void GpencilExporterSVG::export_stroke_polyline(pugi::xml_node gpl_node,
copy_v3_v3(&pt_dst->x, &pt_src->x);
pt_dst->pressure = avg_pressure;
- float radius = point_radius(gpl, gps_temp, diff_mat);
+ float radius = stroke_point_radius_get(gpl, gps_temp, diff_mat);
BKE_gpencil_free_stroke(gps_temp);
More information about the Bf-blender-cvs
mailing list