kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T84649: Quick liquid causing crash on scale operation

Browse Source 
This commit makes use of the updated fluid sources files (previous commit rB9ad828dbad94d279521875db47a3472a38cc9b29)
This commit is contained in:
Sebastián Barschkis 2021-02-02 17:50:08 +01:00
parent 9ad828dbad
commit 8c36f6becf
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/mantaflow/intern/MANTA_main.cpp
View File

@ -1984,7 +1984,9 @@ float MANTA::getTimestep()
bool MANTA::needsRealloc(FluidModifierData *fmd)
{
FluidDomainSettings *fds = fmd->domain;
return (fds->res[0] != mResX || fds->res[1] != mResY || fds->res[2] != mResZ);
return ((fds->res_max[0] - fds->res_min[0]) != mResX ||
(fds->res_max[1] - fds->res_min[1]) != mResY ||
(fds->res_max[2] - fds->res_min[2]) != mResZ);
}
void MANTA::adaptTimestep()

2
intern/mantaflow/intern/strings/fluid_script.h
View File

@ -711,7 +711,7 @@ def fluid_file_export_s$ID$(framenr, file_format, path, dict, file_name=None, mo
file = os.path.join(path, file_name + '_' + framenr + file_format)\n\
if not os.path.isfile(file) or mode_override:\n\
if file_format == '.vdb':\n\
saveCombined = save(name=file, objects=list(dict.values()), worldSize=domainSize_s$ID$, skipDeletedParts=True, compression=vdbCompression_s$ID$, precision=vdbPrecision_s$ID$, clip=vdbClip_s$ID$, clipGrid=clipGrid)\n\
saveCombined = save(name=file, objects=list(dict.values()), worldSize=domainSize_s$ID$, skipDeletedParts=True, compression=vdbCompression_s$ID$, precision=vdbPrecision_s$ID$, clip=vdbClip_s$ID$, clipGrid=clipGrid, meta=True)\n\
elif file_format == '.bobj.gz' or file_format == '.obj':\n\
for name, object in dict.items():\n\
if not os.path.isfile(file) or mode_override:\n\

5
source/blender/blenkernel/intern/fluid.c
View File

@ -4001,9 +4001,12 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *fmd,
has_config = manta_read_config(fds->fluid, fmd, mesh_frame);
}
/* Update mesh data from file is faster than via Python (manta_read_mesh()). */
/* Only load the mesh at the resolution it ways originally simulated at.
* The mesh files don't have a header, i.e. the don't store the grid resolution. */
if (!manta_needs_realloc(fds->fluid, fmd)) {
has_mesh = manta_read_mesh(fds->fluid, fmd, mesh_frame);
}
}
/* Read particles cache. */
if (with_liquid && with_particles) {