[Bf-blender-cvs] [f12b4e53aaf] blender-v2.82-release: Fluid: Fixed try/catch exception issue and unsed variable issue

Sebastián Barschkis noreply at git.blender.org
Fri Feb 7 11:03:43 CET 2020


Commit: f12b4e53aaf768d54bd85ec4713f94e77aaf72f6
Author: Sebastián Barschkis
Date:   Fri Feb 7 11:02:55 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBf12b4e53aaf768d54bd85ec4713f94e77aaf72f6

Fluid: Fixed try/catch exception issue and unsed variable issue

Sergey just pointed this out, fixing in it the release branch to avoid any compilation issues during the actual release. Thx!

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

M	intern/mantaflow/intern/MANTA_main.cpp

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

diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 798ad9c2854..c0c7ef5dbf2 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -2894,7 +2894,7 @@ int MANTA::updateGridFromVDB(const char *filename, float *grid)
   try {
     file.open();
   }
-  catch (const openvdb::IoError) {
+  catch (const openvdb::IoError &) {
     std::cout << "MANTA::updateGridFromVDB(): IOError, invalid OpenVDB file: " << filename
               << std::endl;
     return 0;
@@ -2941,6 +2941,7 @@ int MANTA::updateGridFromRaw(const char *filename, float *grid)
   readBytes = gzread(gzf, grid, expectedBytes);
 
   assert(expectedBytes == readBytes);
+  (void)readBytes;  // Unused in release.
 
   gzclose(gzf);
   return 1;



More information about the Bf-blender-cvs mailing list