Commit: 375a50dad9c5829e2ed205216e0bb7317635868e Author: Sebastián Barschkis Date: Mon May 4 18:18:15 2020 +0200 Branches: master https://developer.blender.org/rB375a50dad9c5829e2ed205216e0bb7317635868e
Merge branch 'blender-v2.83-release' =================================================================== =================================================================== diff --cc intern/mantaflow/intern/MANTA_main.cpp index fd273b728e7,d6c1d05e0da..58d49622597 --- a/intern/mantaflow/intern/MANTA_main.cpp +++ b/intern/mantaflow/intern/MANTA_main.cpp @@@ -3062,7 -3232,7 +3062,7 @@@ void MANTA::updatePointers( bool MANTA::hasConfig(FluidModifierData *mmd, int framenr) { - string extension = getCacheFileEnding(mmd->domain->cache_data_format); - std::string extension = FLUID_DOMAIN_EXTENSION_UNI; ++ string extension = FLUID_DOMAIN_EXTENSION_UNI; return BLI_exists( getFile(mmd, FLUID_DOMAIN_DIR_CONFIG, FLUID_DOMAIN_FILE_CONFIG, extension, framenr).c_str()); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs