[Bf-blender-cvs] [3727bbb127d] greasepencil-object: GPencil: Check return value for SVG export

Antonio Vazquez noreply at git.blender.org
Wed Jul 29 20:29:30 CEST 2020


Commit: 3727bbb127d86f23cad9ef798a7ffec279df1bfa
Author: Antonio Vazquez
Date:   Wed Jul 29 20:29:23 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3727bbb127d86f23cad9ef798a7ffec279df1bfa

GPencil: Check return value for SVG export

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

M	source/blender/editors/io/io_gpencil.c
M	source/blender/io/gpencil/intern/gpencil_io_capi.cc
M	source/blender/io/gpencil/intern/gpencil_io_svg.cc

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

diff --git a/source/blender/editors/io/io_gpencil.c b/source/blender/editors/io/io_gpencil.c
index 6d21f6f6161..c9a4adf0b36 100644
--- a/source/blender/editors/io/io_gpencil.c
+++ b/source/blender/editors/io/io_gpencil.c
@@ -190,8 +190,7 @@ static int wm_gpencil_export_exec(bContext *C, wmOperator *op)
       sprintf(params.frame, "%04d", i);
     }
 
-    gpencil_io_export(&params);
-    done |= true;
+    done |= gpencil_io_export(&params);
 
     if (only_active_frame) {
       break;
@@ -206,6 +205,9 @@ static int wm_gpencil_export_exec(bContext *C, wmOperator *op)
   if (done) {
     BKE_report(op->reports, RPT_INFO, "SVG export file created");
   }
+  else {
+    BKE_report(op->reports, RPT_WARNING, "Unable to export SVG");
+  }
 
   return OPERATOR_FINISHED;
 }
diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
index 81dbf0e20c4..1141ac19208 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
@@ -27,15 +27,16 @@ using blender::io::gpencil::GpencilExporterSVG;
 
 bool gpencil_io_export(const GpencilExportParams *params)
 {
+  bool result = false;
   switch (params->mode) {
     case GP_EXPORT_TO_SVG: {
       GpencilExporterSVG writter = GpencilExporterSVG(params);
-      writter.write(std::string(params->frame));
+      result = writter.write(std::string(params->frame));
       break;
     }
     default:
       break;
   }
 
-  return true;
+  return result;
 }
diff --git a/source/blender/io/gpencil/intern/gpencil_io_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
index e0484fb4c7d..c2c406912a1 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
@@ -83,9 +83,7 @@ bool GpencilExporterSVG::write(std::string actual_frame)
     frame_file.replace(found, 8, actual_frame + ".svg");
   }
 
-  doc.save_file(frame_file.c_str());
-
-  return true;
+  return doc.save_file(frame_file.c_str());
 }
 
 /* Create document header and main svg node. */



More information about the Bf-blender-cvs mailing list