[Bf-blender-cvs] [4453509d83d] master: Fix T73770: Mantaflow is unable to bake fluid simulations on non-ASCII file paths

Sebastián Barschkis noreply at git.blender.org
Wed Feb 19 15:08:01 CET 2020


Commit: 4453509d83dcff4869b39a8d6e14c3d2caeee622
Author: Sebastián Barschkis
Date:   Wed Feb 19 15:07:31 2020 +0100
Branches: master
https://developer.blender.org/rB4453509d83dcff4869b39a8d6e14c3d2caeee622

Fix T73770: Mantaflow is unable to bake fluid simulations on non-ASCII file paths

Some fluid cache functions were not using Blender's more secure BLI_gzopen() function. On Windows there are some special cases which this function can handle compared to the plain gzopen().

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

M	intern/mantaflow/intern/MANTA_main.cpp

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

diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index a78bb9f7719..7a0d4e56d37 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -1455,7 +1455,7 @@ int MANTA::writeConfiguration(FluidModifierData *mmd, int framenr)
   BLI_join_dirfile(targetFile, sizeof(targetFile), cacheDir, ss.str().c_str());
   BLI_path_frame(targetFile, framenr, 0);
 
-  gzFile gzf = gzopen(targetFile, "wb1");  // do some compression
+  gzFile gzf = (gzfile)BLI_gzopen(targetFile, "wb1");  // do some compression
   if (!gzf)
     std::cerr << "writeConfiguration: can't open file: " << targetFile << std::endl;
 
@@ -1550,7 +1550,7 @@ int MANTA::readConfiguration(FluidModifierData *mmd, int framenr)
   if (!BLI_exists(targetFile))
     return 0;
 
-  gzFile gzf = gzopen(targetFile, "rb");  // do some compression
+  gzFile gzf = (gzfile)BLI_gzopen(targetFile, "rb");  // do some compression
   if (!gzf)
     std::cerr << "readConfiguration: can't open file: " << targetFile << std::endl;



More information about the Bf-blender-cvs mailing list