blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fluid: Another adjustment for Python pointers 

Yet another update to ensure that pointer variables are always up to date, i.e. those referencing the memory allocated by Mantaflow. Outdated pointers usually show up through flickering in viewport.
This commit is contained in:
Sebastián Barschkis 2020-07-31 23:27:51 +02:00
parent 251ae108e7
commit 106e7654e8
Notes: blender-bot 2023-02-14 06:00:50 +01:00 
Referenced by issue #73838, Mantaflow: Viewport shading of gas changes as "Initial Temperature" is modified.
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1119,6 +1119,7 @@ static void ensure_obstaclefields(FluidDomainSettings *fds)
if (fds->active_fields & FLUID_DOMAIN_ACTIVE_GUIDE) {
manta_ensure_guiding(fds->fluid, fds->fmd);
}
manta_update_pointers(fds->fluid, fds->fmd);
}
static void update_obstacleflags(FluidDomainSettings *fds,
@ -2605,6 +2606,7 @@ static void ensure_flowsfields(FluidDomainSettings *fds)
fds->particle_type & FLUID_DOMAIN_PARTICLE_TRACER)) {
manta_liquid_ensure_sndparts(fds->fluid, fds->fmd);
}
manta_update_pointers(fds->fluid, fds->fmd);
}
static void update_flowsflags(FluidDomainSettings *fds, Object **flowobjs, int numflowobj)
@ -3627,11 +3629,7 @@ static int manta_step(
manta_smoke_calc_transparency(fds, DEG_get_evaluated_view_layer(depsgraph));
}
/* Ensure that fluid data is always up to date. */
manta_update_pointers(fds->fluid, fmd);
BLI_mutex_unlock(&object_update_lock);
return result;
}
@ -4080,6 +4078,9 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *fmd,
}
}
/* Ensure that fluid pointers are always up to date at the end of modifier processing. */
manta_update_pointers(fds->fluid, fmd);
fds->flags &= ~FLUID_DOMAIN_FILE_LOAD;
fmd->time = scene_framenr;
}