[Bf-blender-cvs] [d4261760c7e] blender-v2.82-release: Fluid: Fix for mesh velocities
Sebastián Barschkis
noreply at git.blender.org
Thu Jan 16 15:33:54 CET 2020
Commit: d4261760c7ea1095dd0be6f6a5196db711f916a9
Author: Sebastián Barschkis
Date: Thu Jan 16 15:32:54 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBd4261760c7ea1095dd0be6f6a5196db711f916a9
Fluid: Fix for mesh velocities
Was using incorrect file format when reading mesh velocities from cache
===================================================================
M intern/mantaflow/intern/MANTA_main.cpp
===================================================================
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());
}
}
More information about the Bf-blender-cvs
mailing list