Commit: 1a05cf6547a70397c60beb1e123153213c207766
Author: Sebastián Barschkis
Date: Fri Jul 15 14:50:44 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB1a05cf6547a70397c60beb1e123153213c207766
cleaned up /removed some old TODOs
===================================================================
M intern/mantaflow/intern/strings/liquid_script.h
M source/blender/blenkernel/intern/pointcache.c
===================================================================
diff --git a/intern/mantaflow/intern/strings/liquid_script.h
b/intern/mantaflow/intern/strings/liquid_script.h
index 44e3d86..a112aaa 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -56,6 +56,7 @@ phiParts = s.create(LevelsetGrid)\n\
phi = s.create(LevelsetGrid)\n\
phiInit = s.create(LevelsetGrid)\n\
pressure = s.create(RealGrid)\n\
+# TODO (sebbas): remove density grid. only here because of stand in\n\
density = s.create(RealGrid)\n\
\n\
vel = s.create(MACGrid)\n\
@@ -92,7 +93,8 @@ def manta_step(start_frame):\n\
flags.updateFromLevelset(phi)\n\
sampleLevelsetWithParticles( phi=phi, flags=flags, parts=pp,
discretization=2, randomness=0.01 )\n\
mapGridToPartsVec3(source=vel, parts=pp, target=pVel )\n\
- phi.save('/Users/sbarschkis/Desktop/phi.uni')\n\
+ # sebbas: just using this for local debugging\n\
+ # phi.save('/Users/sbarschkis/Desktop/phi.uni')\n\
\n\
#for i in range(int(gs.z)):\n\
#phiInit.printGrid(zSlice=int(i))\n\
diff --git a/source/blender/blenkernel/intern/pointcache.c
b/source/blender/blenkernel/intern/pointcache.c
index 0b0c367..22b7514 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1646,7 +1646,6 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct
Object *ob, struct SmokeMo
pid->read_point = NULL;
pid->interpolate_point = NULL;
- // TODO (sebbas) need to disable this again for liquids
pid->read_stream = ptcache_smoke_read;
pid->write_stream = ptcache_smoke_write;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
