[Bf-blender-cvs] [909715d] fluid-mantaflow: added flags to distinguish smoke and liquid setup

[Sebastián Barschkis]

Commit: 909715d336776914cd856a80ebb78913269d7174
Author: Sebastián Barschkis
Date:   Fri May 20 18:41:49 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB909715d336776914cd856a80ebb78913269d7174

added flags to distinguish smoke and liquid setup

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

M	intern/mantaflow/intern/SMOKE.cpp
M	intern/mantaflow/intern/SMOKE.h

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

diff --git a/intern/mantaflow/intern/SMOKE.cpp b/intern/mantaflow/intern/SMOKE.cpp
index 2ea0dcf..b06c81d 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -56,6 +56,8 @@ SMOKE::SMOKE(int *res, SmokeModifierData *smd)
 	mUsingFire    = smd->domain->active_fields & SM_ACTIVE_FIRE;
 	mUsingColors  = smd->domain->active_fields & SM_ACTIVE_COLORS;
 	mUsingHighRes = smd->domain->flags & MOD_SMOKE_HIGHRES;
+	mUsingLiquid  = true; // TODO Hardcoded for liquid testing (no gui yet)
+	mUsingSmoke   = false;
 	
 	// Make sure that string vector does not contain any previous commands
 	mCommands.clear();
diff --git a/intern/mantaflow/intern/SMOKE.h b/intern/mantaflow/intern/SMOKE.h
index 61a0472..1738af8 100644
--- a/intern/mantaflow/intern/SMOKE.h
+++ b/intern/mantaflow/intern/SMOKE.h
@@ -118,6 +118,8 @@ private:
 	bool mUsingColors;
 	bool mUsingFire;
 	bool mUsingHighRes;
+	bool mUsingLiquid;
+	bool mUsingSmoke;
 	
 	int mResX;
 	int mResY;