diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-02-07 13:05:03 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-02-07 13:05:03 +0300 |
commit | 638adb2f1a20a345542682dbe36fa313a865764c (patch) | |
tree | 53f2ce0e9e26ce925627b2f55d1cc5d7af98cc8e /intern | |
parent | 753323af15d7d8986efbdc4ad8d81331ddeee470 (diff) | |
parent | f12b4e53aaf768d54bd85ec4713f94e77aaf72f6 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'intern')
-rw-r--r-- | intern/mantaflow/intern/MANTA_main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |