[Bf-blender-cvs] [40eecf3] fluid-mantaflow: temporary fix for viewport tranparency (additional density grid in liquid sim)

[Sebastián Barschkis]

Commit: 40eecf37405d03cf60d3e1d2f6090652e864df7c
Author: Sebastián Barschkis
Date:   Sat Jun 18 17:33:41 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB40eecf37405d03cf60d3e1d2f6090652e864df7c

temporary fix for viewport tranparency (additional density grid in liquid sim)

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

M	intern/mantaflow/intern/SMOKE.cpp
M	intern/mantaflow/intern/strings/liquid_script.h
M	source/blender/blenkernel/intern/smoke.c

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

diff --git a/intern/mantaflow/intern/SMOKE.cpp b/intern/mantaflow/intern/SMOKE.cpp
index 5924d1e..6677e5e 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -785,6 +785,7 @@ void SMOKE::updatePointers(SmokeModifierData *smd)
 	// Liquid
 	if (mUsingLiquid) {
 		mPhi        = (float*)         getGridPointer("phiInit",         "s");
+		mDensity    = (float*)         getGridPointer("density",         "s");
 	}
 	
 	// Smoke
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index e67d5da..44e3d86 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\
+density    = s.create(RealGrid)\n\
 \n\
 vel        = s.create(MACGrid)\n\
 velOld     = s.create(MACGrid)\n\
@@ -189,6 +190,7 @@ if 'phiParts'   in globals() : del phiParts\n\
 if 'phi'        in globals() : del phi\n\
 if 'phiInit'    in globals() : del phiInit\n\
 if 'pressure'   in globals() : del pressure\n\
+if 'density'    in globals() : del density\n\
 if 'vel'        in globals() : del vel\n\
 if 'velOld'     in globals() : del velOld\n\
 if 'velParts'   in globals() : del velParts\n\
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index fa8ff9e..ebf6247 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3216,8 +3216,7 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 			step(scene, ob, smd, dm, scene->r.frs_sec / scene->r.frs_sec_base);
 		}
 		// create shadows before writing cache so they get stored
-		// TODO (sebbas) disabled for liquid integration
-//		smoke_calc_transparency(sds, scene);
+		smoke_calc_transparency(sds, scene);
 
 #ifndef WITH_MANTA
 		if (sds->wt)