From d4261760c7ea1095dd0be6f6a5196db711f916a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Barschkis?= Date: Thu, 16 Jan 2020 15:32:54 +0100 Subject: Fluid: Fix for mesh velocities Was using incorrect file format when reading mesh velocities from cache --- intern/mantaflow/intern/MANTA_main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'intern/mantaflow') 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()); } } -- cgit v1.2.3