[Bf-blender-cvs] [e7e6b02ed99] master: Fluid: Minor cleanup and sanity checks

[Sebastián Barschkis]

Commit: e7e6b02ed997d53eb5237c4398c2f0b7902bffaa
Author: Sebastián Barschkis
Date:   Thu Apr 30 16:11:56 2020 +0200
Branches: master
https://developer.blender.org/rBe7e6b02ed997d53eb5237c4398c2f0b7902bffaa

Fluid: Minor cleanup and sanity checks

===================================================================

M	source/blender/blenkernel/intern/fluid.c

===================================================================

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 96efac8f2c5..1da6d9e3769 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -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);