blender
/
blender
136
406
Fork 590
Code Issues 6.3k Pull Requests 763 Projects 19 Wiki Activity

Fluid: Minor cleanup and sanity checks

This commit is contained in:
Sebastián Barschkis 2020-04-30 16:11:56 +02:00
parent 713b4c10a6
commit e7e6b02ed9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,8 @@
# include "RE_shader_ext.h"
# include "CLG_log.h"
# include "manta_fluid_API.h"
#endif /* WITH_FLUID */
@ -96,6 +98,8 @@ static void BKE_fluid_modifier_reset_ex(struct FluidModifierData *mmd, bool need
#ifdef WITH_FLUID
// #define DEBUG_PRINT
static CLG_LogRef LOG = {"bke.fluid"};
/* -------------------------------------------------------------------- */
/** \name Fluid API
* \{ */
@ -948,11 +952,7 @@ static void sample_effector(FluidEffectorSettings *mes,
velocity_map[index * 3 + 2] += hit_vel[2];
# ifdef DEBUG_PRINT
/* Debugging: Print object velocities. */
printf("adding effector object vel: [%f, %f, %f], dx is: %f\n",
hit_vel[0],
hit_vel[1],
hit_vel[2],
mds->dx);
printf("adding effector object vel: [%f, %f, %f]\n", hit_vel[0], hit_vel[1], hit_vel[2]);
# endif
}
}
@ -3773,6 +3773,7 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd,
/* Fluid domain init must not fail in order to continue modifier evaluation. */
if (!mds->fluid && !BKE_fluid_modifier_init(mmd, depsgraph, ob, scene, me)) {
CLOG_ERROR(&LOG, "Fluid initialization failed. Should not happen!");
return;
}
BLI_assert(mds->fluid);