[Bf-blender-cvs] [bf0454b78bc] master: Fix build error and warnings in new grease pencil IO code

Hans Goudey noreply at git.blender.org
Wed Mar 24 16:33:49 CET 2021


Commit: bf0454b78bce7609b74423bd47d3d76fdadb077f
Author: Hans Goudey
Date:   Wed Mar 24 11:33:30 2021 -0400
Branches: master
https://developer.blender.org/rBbf0454b78bce7609b74423bd47d3d76fdadb077f

Fix build error and warnings in new grease pencil IO code

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

M	source/blender/io/gpencil/intern/gpencil_io_capi.cc
M	source/blender/io/gpencil/intern/gpencil_io_import_base.cc

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

diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
index 34539a66fe8..231d23948ef 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
@@ -58,6 +58,7 @@ using blender::io::gpencil::GpencilExporterSVG;
 using blender::io::gpencil::GpencilImporterSVG;
 
 /* Check if frame is included. */
+#ifdef WITH_HARU
 static bool is_keyframe_included(bGPdata *gpd_, const int32_t framenum, const bool use_selected)
 {
   /* Check if exist a frame. */
@@ -75,6 +76,7 @@ static bool is_keyframe_included(bGPdata *gpd_, const int32_t framenum, const bo
   }
   return false;
 }
+#endif
 
 /* Import frame. */
 static bool gpencil_io_import_frame(void *in_importer, const GpencilIOParams &iparams)
@@ -177,7 +179,7 @@ bool gpencil_io_export(const char *filename, GpencilIOParams *iparams)
   Scene *scene_ = CTX_data_scene(iparams->C);
   Object *ob = CTX_data_active_object(iparams->C);
 
-  UNUSED_VARS(depsgraph_, scene_, ob);
+  UNUSED_VARS(filename, depsgraph_, scene_, ob);
 
   switch (iparams->mode) {
 #ifdef WITH_PUGIXML
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
index b49b4c969ad..2e7cfdeb5cd 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
@@ -35,8 +35,6 @@
 
 #include "gpencil_io_import_base.h"
 
-#include "pugixml.hpp"
-
 namespace blender::io::gpencil {
 
 /* Constructor. */



More information about the Bf-blender-cvs mailing list