[Bf-blender-cvs] [f8f45b1b9ef] greasepencil-object: GPencil: Remove Context use to minimum

Antonio Vazquez noreply at git.blender.org
Tue Jul 28 18:36:57 CEST 2020


Commit: f8f45b1b9ef8b3e40d558d96b51817277a2860fb
Author: Antonio Vazquez
Date:   Tue Jul 28 18:36:45 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf8f45b1b9ef8b3e40d558d96b51817277a2860fb

GPencil: Remove Context use to minimum

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

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.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index 2cadaf29429..767e87a230e 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -28,6 +28,7 @@
 
 #include "gpencil_io_exporter.h"
 
+struct Depsgraph;
 struct Main;
 struct ARegion;
 
@@ -64,6 +65,7 @@ class GpencilExporter {
   GpencilExportParams params;
   char out_filename[FILE_MAX];
   /* Data for easy access. */
+  struct Depsgraph *depsgraph;
   struct bGPdata *gpd;
 };
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
index e2c35b694f6..1121eca067d 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
@@ -72,6 +72,7 @@ GpencilExporterSVG::GpencilExporterSVG(const struct GpencilExportParams *params)
   this->params.mode = params->mode;
   this->params.flag = params->flag;
 
+  this->depsgraph = CTX_data_depsgraph_pointer(params->C);
   this->gpd = (bGPdata *)params->ob->data;
 
   /* Prepare output filename with full path. */
@@ -190,7 +191,6 @@ void GpencilExporterSVG::export_layers(void)
   float color[3] = {1.0f, 0.5f, 0.01f};
   std::string hex = rgb_to_hex(color);
 
-  Depsgraph *depsgraph = CTX_data_depsgraph_pointer(params.C);
   Object *ob = params.ob;
 
   bGPdata *gpd = (bGPdata *)ob->data;



More information about the Bf-blender-cvs mailing list