[Bf-blender-cvs] [6400f54b4cc] master: Fix T76426: Mantaflow Liquid - Gravity not respecting Time Scale from domain.

Sebastián Barschkis noreply at git.blender.org
Thu May 7 17:33:46 CEST 2020


Commit: 6400f54b4cc6d9cdb420ac4f62dd5eb0387aa7c0
Author: Sebastián Barschkis
Date:   Thu May 7 17:15:15 2020 +0200
Branches: master
https://developer.blender.org/rB6400f54b4cc6d9cdb420ac4f62dd5eb0387aa7c0

Fix T76426: Mantaflow Liquid - Gravity not respecting Time Scale from domain.

Removed timescale from conversion factor - factors should stay constant even if timescale changes.

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

M	intern/mantaflow/intern/strings/fluid_script.h

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

diff --git a/intern/mantaflow/intern/strings/fluid_script.h b/intern/mantaflow/intern/strings/fluid_script.h
index c0a23f77d7a..0619da67f64 100644
--- a/intern/mantaflow/intern/strings/fluid_script.h
+++ b/intern/mantaflow/intern/strings/fluid_script.h
@@ -140,7 +140,7 @@ mantaMsg('1 Mantaflow cell is ' + str(ratioMetersToRes_s$ID$) + ' Blender length
 ratioResToBLength_s$ID$ = float(res_s$ID$) / float(domainSize_s$ID$) # [cells / blength] (blength: cm, m, or km, ... )\n\
 mantaMsg('1 Blender length unit is ' + str(ratioResToBLength_s$ID$) + ' Mantaflow cells long.')\n\
 \n\
-ratioBTimeToTimstep_s$ID$ = float(1) / float(0.1 * 25 * timeScale_s$ID$) # the time within 1 blender time unit, see also fluid.c\n\
+ratioBTimeToTimstep_s$ID$ = float(1) / float(0.1 * 25) # the time within 1 blender time unit, see also fluid.c\n\
 mantaMsg('1 Blender time unit is ' + str(ratioBTimeToTimstep_s$ID$) + ' Mantaflow time units long.')\n\
 \n\
 ratioFrameToFramelength_s$ID$ = float(1) / float(frameLength_s$ID$) # the time within 1 frame\n\



More information about the Bf-blender-cvs mailing list