[Bf-blender-cvs] [b93dd2b9d69] temp-gpencil-io: Cleanup return values

Antonio Vazquez noreply at git.blender.org
Wed Mar 17 19:32:33 CET 2021


Commit: b93dd2b9d699726afb449f125b24f905a5f8d844
Author: Antonio Vazquez
Date:   Wed Mar 17 18:18:51 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rBb93dd2b9d699726afb449f125b24f905a5f8d844

Cleanup return values

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

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

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

diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
index 6063c0970e1..6c904f172fd 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
@@ -171,13 +171,9 @@ static bool gpencil_io_export_frame_svg(GpencilExporterSVG *exporter,
 /* Main import entry point function. */
 bool gpencil_io_import(const char *filename, GpencilIOParams *iparams)
 {
-  bool done = false;
-
   GpencilImporterSVG importer = GpencilImporterSVG(filename, iparams);
 
-  done |= gpencil_io_import_frame(&importer, iparams);
-
-  return done;
+  return gpencil_io_import_frame(&importer, iparams);
 }
 
 /* Main export entry point function. */
@@ -189,22 +185,18 @@ bool gpencil_io_export(const char *filename, GpencilIOParams *iparams)
 
   UNUSED_VARS(depsgraph_, scene_, ob);
 
-  bool done = false;
-
   switch (iparams->mode) {
 #ifdef WITH_PUGIXML
     case GP_EXPORT_TO_SVG: {
-      /* Prepare document. */
       GpencilExporterSVG exporter = GpencilExporterSVG(filename, iparams);
-
-      done |= gpencil_io_export_frame_svg(&exporter, iparams, true, true, true);
+      return gpencil_io_export_frame_svg(&exporter, iparams, true, true, true);
       break;
     }
 #endif
 #ifdef WITH_HARU
     case GP_EXPORT_TO_PDF: {
       GpencilExporterPDF exporter = GpencilExporterPDF(filename, iparams);
-      done |= gpencil_io_export_pdf(depsgraph_, scene_, ob, &exporter, iparams);
+      return gpencil_io_export_pdf(depsgraph_, scene_, ob, &exporter, iparams);
       break;
     }
 #endif
@@ -212,5 +204,5 @@ bool gpencil_io_export(const char *filename, GpencilIOParams *iparams)
     default:
       break;
   }
-  return done;
+  return false;
 }



More information about the Bf-blender-cvs mailing list