[Bf-blender-cvs] [a308d8417fd] greasepencil-object: GPencil: Remove bmain context use

[Antonio Vazquez]

Commit: a308d8417fd22163de9957f8425739e8b2a87bfd
Author: Antonio Vazquez
Date:   Tue Jul 28 18:51:59 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa308d8417fd22163de9957f8425739e8b2a87bfd

GPencil: Remove bmain context use

This is part of the cleanup to reduce the use of bContext to minimum

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

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 fbd92632ae9..2dbd62fea12 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -60,9 +60,8 @@ namespace gpencil {
  * \param C: Context.
  * \param filename: Path of the file provided by save dialog.
  */
-void GpencilExporter::set_out_filename(struct bContext *C, char *filename)
+void GpencilExporter::set_out_filename(char *filename)
 {
-  Main *bmain = CTX_data_main(C);
   BLI_strncpy(out_filename, filename, FILE_MAX);
   BLI_path_abs(out_filename, BKE_main_blendfile_path(bmain));
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index 767e87a230e..400232cd778 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -43,7 +43,7 @@ class GpencilExporter {
 
  public:
   virtual bool write(std::string actual_frame) = 0;
-  void set_out_filename(struct bContext *C, char *filename);
+  void set_out_filename(char *filename);
 
   /* Geometry functions. */
   bool gpencil_3d_point_to_screen_space(struct ARegion *region,
@@ -67,6 +67,7 @@ class GpencilExporter {
   /* Data for easy access. */
   struct Depsgraph *depsgraph;
   struct bGPdata *gpd;
+  struct Main *bmain;
 };
 
 }  // namespace gpencil
diff --git a/source/blender/io/gpencil/intern/gpencil_io_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
index 1121eca067d..57b110aae2e 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
@@ -72,11 +72,12 @@ GpencilExporterSVG::GpencilExporterSVG(const struct GpencilExportParams *params)
   this->params.mode = params->mode;
   this->params.flag = params->flag;
 
+  this->bmain = CTX_data_main(params->C);
   this->depsgraph = CTX_data_depsgraph_pointer(params->C);
   this->gpd = (bGPdata *)params->ob->data;
 
   /* Prepare output filename with full path. */
-  set_out_filename(params->C, params->filename);
+  set_out_filename(params->filename);
 }
 
 /* Main write method for SVG format. */