Commit: 199b6cdc1ee494bfae85eed74a701a7f5557dc34
Author: Roman Pogribnyi
Date: Sun Aug 31 23:03:26 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB199b6cdc1ee494bfae85eed74a701a7f5557dc34
timestep config corrected
===================================================================
M intern/smoke/intern/MANTA.cpp
M intern/smoke/intern/scenarios/smoke.h
===================================================================
diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index ab319c0..d181d2e 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -593,8 +593,10 @@ std::string getRealValue(SmokeModifierData *smd, Scene *s,
const std::string& va
ss << smd->domain->wt->getResBig()[1];
else if (varName == "HRESZ")
ss << smd->domain->wt->getResBig()[2];
- else if (varName == "XL_TIMESTEP") /*add support*/
- ss << smd->domain->noise_time_anim *
smd->domain->amplify+1;/*lowres time * upres*/
+ else if (varName == "TIMESTEP")
+ ss << smd->domain->time_scale * 0.1f;
+ else if (varName == "XL_TIMESTEP")
+ ss << smd->domain->time_scale * 0.1f;
else if (varName == "USE_WAVELETS")
ss << (smd->domain->flags & MOD_SMOKE_HIGHRES)?"True":"False";
else if (varName == "BUYO_X")
diff --git a/intern/smoke/intern/scenarios/smoke.h
b/intern/smoke/intern/scenarios/smoke.h
index d69f8aa..af2f63c 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -143,7 +143,7 @@ if $USE_WAVELETS$:\n\
res = $RES$\n\
gs = vec3($RESX$, $RESY$, $RESZ$) \n\
s = Solver(name = 'main', gridSize = gs, dim = solver_dim) \n\
-s.timestep = 1 \n\
+s.timestep = $TIMESTEP$ \n\
noise = s.create(NoiseField, fixedSeed=256, loadFromFile=True) \n\
noise.posScale = vec3(20) \n\
noise.clamp = False \n\
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
