[Bf-blender-cvs] [c933f95] fluid-mantaflow: added fields for meshes to fluid object

[Sebastián Barschkis]

Commit: c933f959af9d6782981301b5d78a0c34b9f30d60
Author: Sebastián Barschkis
Date:   Tue Jun 14 22:45:12 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBc933f959af9d6782981301b5d78a0c34b9f30d60

added fields for meshes to fluid object

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

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 2145b5a..52e9ae6c 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -113,6 +113,10 @@ SMOKE::SMOKE(int *res, SmokeModifierData *smd)
 	// Liquids
 	mPhi            = NULL;
 	mPhiHigh        = NULL;
+	
+	mNumVertices  = 0;
+	mNumNormals   = 0;
+	mNumTriangles = 0;
 
 	// Only start Mantaflow once. No need to start whenever new SMOKE objected is allocated
 	if (!mantaInitialized)
diff --git a/intern/mantaflow/intern/SMOKE.h b/intern/mantaflow/intern/SMOKE.h
index 306c618..0895dab 100644
--- a/intern/mantaflow/intern/SMOKE.h
+++ b/intern/mantaflow/intern/SMOKE.h
@@ -183,6 +183,19 @@ private:
 	// Liquids
 	float* mPhi;
 	float* mPhiHigh;
+	// Mesh fields for liquid surface
+	int mNumVertices;
+	int mNumNormals;
+	int mNumTriangles;
+	std::vector<float> mVerticesX;
+	std::vector<float> mVerticesY;
+	std::vector<float> mVerticesZ;
+	std::vector<float> mNormalsX;
+	std::vector<float> mNormalsY;
+	std::vector<float> mNormalsZ;
+	std::vector<int> mTrianglesX;
+	std::vector<int> mTrianglesY;
+	std::vector<int> mTrianglesZ;
 	
 	void initDomain(struct SmokeModifierData *smd);
 	void initDomainHigh(struct SmokeModifierData *smd);