[Bf-blender-cvs] [dfec6eb3e64] greasepencil-object: GPencil: More cleanup

[Antonio Vazquez]

Commit: dfec6eb3e64baa4ea80cbb09fca9c186e535663c
Author: Antonio Vazquez
Date:   Sat Aug 15 17:04:56 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdfec6eb3e64baa4ea80cbb09fca9c186e535663c

GPencil: More cleanup

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

M	source/blender/io/gpencil/intern/gpencil_io_export_base.cc
M	source/blender/io/gpencil/intern/gpencil_io_export_base.h

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

diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_base.cc b/source/blender/io/gpencil/intern/gpencil_io_export_base.cc
index 5cc7af123d7..47cf4f4fa60 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_base.cc
@@ -494,18 +494,18 @@ void GpencilExporter::selected_objects_boundbox_set(void)
   add_v2_fl(r_min, gap * -1.0f);
   add_v2_fl(r_max, gap);
 
-  select_box.xmin = r_min[0];
-  select_box.ymin = r_min[1];
-  select_box.xmax = r_max[0];
-  select_box.ymax = r_max[1];
+  select_boundbox.xmin = r_min[0];
+  select_boundbox.ymin = r_min[1];
+  select_boundbox.xmax = r_max[0];
+  select_boundbox.ymax = r_max[1];
 }
 
 void GpencilExporter::selected_objects_boundbox_get(rctf *boundbox)
 {
-  boundbox->xmin = select_box.xmin;
-  boundbox->xmax = select_box.xmax;
-  boundbox->ymin = select_box.ymin;
-  boundbox->ymax = select_box.ymax;
+  boundbox->xmin = select_boundbox.xmin;
+  boundbox->xmax = select_boundbox.xmax;
+  boundbox->ymin = select_boundbox.ymin;
+  boundbox->ymax = select_boundbox.ymax;
 }
 
 void GpencilExporter::set_frame_number(int value)
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_base.h b/source/blender/io/gpencil/intern/gpencil_io_export_base.h
index 87b77b3d08d..c9125bebd06 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_base.h
@@ -32,7 +32,9 @@ struct Depsgraph;
 struct Main;
 struct Object;
 struct RegionView3D;
+struct Scene;
 
+struct bGPdata;
 struct bGPDlayer;
 struct bGPDframe;
 struct bGPDstroke;
@@ -133,7 +135,7 @@ class GpencilExporter {
   bool is_fill;
   float avg_opacity;
   bool is_camera;
-  rctf select_box;
+  rctf select_boundbox;
 };
 
 }  // namespace blender::io::gpencil