[Bf-blender-cvs] [af8fb98] fluid-mantaflow: removed 'stand-in' grid from liquid script (transparency functions only handling smoke domains)

[Sebastián Barschkis]

Commit: af8fb98bb455e95391ce54c78731c55cfa0fc252
Author: Sebastián Barschkis
Date:   Wed Aug 17 00:15:54 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBaf8fb98bb455e95391ce54c78731c55cfa0fc252

removed 'stand-in' grid from liquid script (transparency functions only handling smoke domains)

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

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

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

diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index cb76c7d..011de9e 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -845,7 +845,6 @@ void FLUID::updatePointers(SmokeModifierData *smd)
 	if (mUsingLiquid) {
 		mPhi        = (float*)         getGridPointer("phi",             "s");
 		mPhiInit    = (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 3841247..3c5bc27 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -81,8 +81,6 @@ 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\
 velOld     = s.create(MACGrid)\n\
@@ -297,7 +295,6 @@ 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 8c19400..f900069 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3224,7 +3224,9 @@ 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
-		smoke_calc_transparency(sds, scene);
+		if (sds->type == MOD_SMOKE_DOMAIN_TYPE_GAS) {
+			smoke_calc_transparency(sds, scene);
+		}
 
 #ifndef WITH_MANTA
 		if (sds->wt && sds->total_cells > 1) {