[Bf-blender-cvs] [daeab89f75f] greasepencil-object: GPencil: Reload object list for each frame

[Antonio Vazquez]

Commit: daeab89f75ffeac8e50afa7ab7f7200931b1cc75
Author: Antonio Vazquez
Date:   Tue Aug 4 08:58:47 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdaeab89f75ffeac8e50afa7ab7f7200931b1cc75

GPencil: Reload object list for each frame

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

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 22a2eebb4aa..7e46f5dc17f 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -144,6 +144,7 @@ void GpencilExporter::create_object_list(void)
 
   float camera_z_axis[3];
   copy_v3_v3(camera_z_axis, rv3d->viewinv[2]);
+  ob_list_.clear();
 
   LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
     Object *object = base->object;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index 6ced5c38c33..2fd1531ba6a 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -94,6 +94,7 @@ class GpencilExporter {
   float stroke_average_pressure_get(struct bGPDstroke *gps);
   float stroke_point_radius_get(struct bGPDstroke *gps);
   void selected_objects_boundbox(void);
+  void create_object_list(void);
 
   std::string rgb_to_hex(float color[3]);
   void rgb_to_grayscale(float color[3]);
@@ -107,7 +108,6 @@ class GpencilExporter {
   bool gp_style_is_fill(void);
   float stroke_average_opacity(void);
   bool is_camera_mode(void);
-  bool is_bound_mode(void);
 
   void gpl_current_set(struct bGPDlayer *gpl);
   void gpf_current_set(struct bGPDframe *gpf);
@@ -127,7 +127,6 @@ class GpencilExporter {
   rcti select_box;
 
   void set_out_filename(char *filename);
-  void create_object_list(void);
 };
 
 }  // namespace blender::io::gpencil
diff --git a/source/blender/io/gpencil/intern/gpencil_io_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
index fa67c6c712d..4725ac8e57c 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
@@ -143,6 +143,12 @@ void GpencilExporterSVG::export_layers(void)
 {
   const bool is_clipping = is_camera_mode() && (params_.flag & (GP_EXPORT_CLIP_CAMERA |
                                                                 GP_EXPORT_STORYBOARD_MODE)) != 0;
+
+  /* If is doing a set of frames, the list of objects can change for each frame. */
+  if (is_camera_mode() && ((params_.flag & GP_EXPORT_ACTIVE_FRAME) == 0)) {
+    create_object_list();
+  }
+
   for (ObjectZ &obz : ob_list_) {
     Object *ob = obz.ob;