[Bf-blender-cvs] [fdb2240e4d0] master: Fluid: Fix particle helper grid export

[Sebastián Barschkis]

Commit: fdb2240e4d06e9e552d6cd9ce4ec8d1ab2a6a448
Author: Sebastián Barschkis
Date:   Thu Oct 8 10:25:17 2020 +0200
Branches: master
https://developer.blender.org/rBfdb2240e4d06e9e552d6cd9ce4ec8d1ab2a6a448

Fluid: Fix particle helper grid export

Only export helper levelset and velocity (belonging to previous state) at the beginning of an (adaptive) frame.

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

M	intern/mantaflow/intern/strings/liquid_script.h

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

diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index f26930b5d03..71f55a1d336 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -246,8 +246,10 @@ def liquid_step_$ID$():\n\
     pushOutofObs(parts=pp_s$ID$, flags=flags_s$ID$, phiObs=phiObs_s$ID$)\n\
     \n\
     # save original states for later (used during mesh / secondary particle creation)\n\
-    phiTmp_s$ID$.copyFrom(phi_s$ID$)\n\
-    velTmp_s$ID$.copyFrom(vel_s$ID$)\n\
+    # but only save the state at the beginning of an adaptive frame\n\
+    if not s$ID$.timePerFrame:\n\
+        phiTmp_s$ID$.copyFrom(phi_s$ID$)\n\
+        velTmp_s$ID$.copyFrom(vel_s$ID$)\n\
     \n\
     mantaMsg('Advecting phi')\n\
     advectSemiLagrange(flags=flags_s$ID$, vel=vel_s$ID$, grid=phi_s$ID$, order=1) # first order is usually enough\n\