Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-01-16 17:32:54 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-01-16 17:33:15 +0300
commitd4261760c7ea1095dd0be6f6a5196db711f916a9 (patch)
tree186db4c50f6608f09c046e18881fd6084046336e /intern/mantaflow
parent59589457a56630e033748aa07579d8108f422d8d (diff)
Fluid: Fix for mesh velocities
Was using incorrect file format when reading mesh velocities from cache
Diffstat (limited to 'intern/mantaflow')
-rw-r--r--intern/mantaflow/intern/MANTA_main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 1980c11fe87..e44498bff84 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -1438,6 +1438,7 @@ int MANTA::readMesh(FluidModifierData *mmd, int framenr)
targetFile[0] = '\0';
std::string mformat = getCacheFileEnding(mmd->domain->cache_mesh_format);
+ std::string dformat = getCacheFileEnding(mmd->domain->cache_data_format);
BLI_path_join(cacheDirMesh,
sizeof(cacheDirMesh),
@@ -1463,7 +1464,7 @@ int MANTA::readMesh(FluidModifierData *mmd, int framenr)
if (mUsingMVel) {
ss.str("");
ss << "liquid_load_meshvel_" << mCurrentID << "('" << escapeSlashes(cacheDirMesh) << "', "
- << framenr << ", '" << mformat << "')";
+ << framenr << ", '" << dformat << "')";
pythonCommands.push_back(ss.str());
}
}