[Bf-blender-cvs] [61b15af3e90] greasepencil-object: GPencil: More cleanup in SVG exporter
Antonio Vazquez
noreply at git.blender.org
Wed Jul 29 10:35:37 CEST 2020
Commit: 61b15af3e90e86b257849b500e803cad87e7cbb6
Author: Antonio Vazquez
Date: Tue Jul 28 23:38:36 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB61b15af3e90e86b257849b500e803cad87e7cbb6
GPencil: More cleanup in SVG exporter
===================================================================
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 d1777ff6104..da65e7d8a8c 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -159,7 +159,6 @@ bool GpencilExporter::is_stroke_thickness_constant(struct bGPDstroke *gps)
float GpencilExporter::stroke_point_radius_get(struct bGPDstroke *gps)
{
const bGPDlayer *gpl = gpl_current_get();
- RegionView3D *rv3d = (RegionView3D *)params.region->regiondata;
bGPDspoint *pt = NULL;
float v1[2], screen_co[2], screen_ex[2];
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index bc768a0a7f6..e878b1ea80f 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -35,6 +35,7 @@
struct Depsgraph;
struct Main;
struct ARegion;
+struct RegionView3D;
struct bGPDlayer;
struct bGPDframe;
@@ -71,6 +72,7 @@ class GpencilExporter {
struct Depsgraph *depsgraph;
struct bGPdata *gpd;
struct Main *bmain;
+ struct RegionView3D *rv3d;
struct bGPDlayer *gpl_current_get(void)
{
diff --git a/source/blender/io/gpencil/intern/gpencil_io_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
index 1ac3668c6ed..2916474d4aa 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
@@ -72,10 +72,11 @@ GpencilExporterSVG::GpencilExporterSVG(const struct GpencilExportParams *params)
this->params.mode = params->mode;
this->params.flag = params->flag;
+ /* Easy access data. */
this->bmain = CTX_data_main(params->C);
this->depsgraph = CTX_data_depsgraph_pointer(params->C);
+ this->rv3d = (RegionView3D *)params->region->regiondata;
this->gpd = (bGPdata *)params->ob->data;
-
this->invert_axis[0] = false;
this->invert_axis[1] = true;
@@ -191,8 +192,6 @@ void GpencilExporterSVG::export_style_list(void)
/* Main layer loop. */
void GpencilExporterSVG::export_layers(void)
{
- RegionView3D *rv3d = (RegionView3D *)params.region->regiondata;
-
float color[3] = {1.0f, 0.5f, 0.01f};
std::string hex = rgb_to_hex(color);
More information about the Bf-blender-cvs
mailing list