[Bf-blender-cvs] [152e58dff16] fluid-mantaflow: renamed debug level flag

[Sebastián Barschkis]

Commit: 152e58dff16608c34726debc3e9fa7e7c5cea1f6
Author: Sebastián Barschkis
Date:   Tue Jun 6 15:19:45 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB152e58dff16608c34726debc3e9fa7e7c5cea1f6

renamed debug level flag

flag was conflicting in debug mode

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

M	intern/mantaflow/intern/FLUID.cpp
M	intern/mantaflow/intern/FLUID.h

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

diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index 4923c289b70..86ad1d778db 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -49,11 +49,11 @@
 
 std::atomic<bool> FLUID::mantaInitialized(false);
 std::atomic<int> FLUID::solverID(0);
-int FLUID::DEBUG(0);
+int FLUID::with_debug(0);
 
 FLUID::FLUID(int *res, SmokeModifierData *smd) : mCurrentID(++solverID)
 {
-	if (DEBUG)
+	if (with_debug)
 		std::cout << "FLUID: " << mCurrentID << std::endl;
 
 	smd->domain->fluid = this;
@@ -201,7 +201,7 @@ void FLUID::initDomain(SmokeModifierData *smd)
 	
 	// Set manta debug level
 	std::ostringstream debuglevel;
-	debuglevel <<  "set_manta_debuglevel(" << DEBUG << ")";
+	debuglevel <<  "set_manta_debuglevel(" << with_debug << ")";
 	mCommands.push_back(debuglevel.str());
 	runPythonString(mCommands);
 }
@@ -382,7 +382,7 @@ void FLUID::step(int framenr)
 
 FLUID::~FLUID()
 {
-	if (DEBUG)
+	if (with_debug)
 		std::cout << "FLUID: " << mCurrentID << std::endl;
 
 	// Destruction string for Python
@@ -501,7 +501,7 @@ void FLUID::runPythonString(std::vector<std::string> commands)
 
 void FLUID::initializeMantaflow()
 {
-	if (DEBUG)
+	if (with_debug)
 		std::cout << "Initializing  Mantaflow" << std::endl;
 
 	std::string filename = "manta_scene_" + std::to_string(mCurrentID) + ".py";
@@ -517,7 +517,7 @@ void FLUID::initializeMantaflow()
 
 void FLUID::terminateMantaflow()
 {
-	if (DEBUG)
+	if (with_debug)
 		std::cout << "Terminating Mantaflow" << std::endl;
 
 	PyGILState_STATE gilstate = PyGILState_Ensure();
@@ -878,7 +878,7 @@ void FLUID::updateMeshData(const char* filename)
 	mNumVertices = 0;
 	gzread(gzf, &mNumVertices, sizeof(int));
 	
-	if (DEBUG)
+	if (with_debug)
 		std::cout << "read mesh , num verts: " << mNumVertices << std::endl;
 
 	if (mNumVertices)
@@ -974,7 +974,7 @@ void FLUID::updateParticleData(const char* filename)
 	gzread(gzf, &info, sizeof(info));
 	gzread(gzf, &timestamp, sizeof(unsigned long long));
 
-	if (DEBUG)
+	if (with_debug)
 		std::cout << "read particles , num particles " << mNumParticles << std::endl;
 
 	// Sanity check
@@ -1007,7 +1007,7 @@ void FLUID::updateParticleData(const char* filename)
 
 void FLUID::updatePointers()
 {
-	if (DEBUG)
+	if (with_debug)
 		std::cout << "Updating pointers low res, ID: " << mCurrentID << std::endl;
 
 	std::string id = std::to_string(mCurrentID);
@@ -1060,7 +1060,7 @@ void FLUID::updatePointers()
 
 void FLUID::updatePointersHigh()
 {
-	if (DEBUG)
+	if (with_debug)
 		std::cout << "Updating pointers high res" << std::endl;
 
 	std::string id = std::to_string(mCurrentID);
diff --git a/intern/mantaflow/intern/FLUID.h b/intern/mantaflow/intern/FLUID.h
index af366e378dc..4a5cb4c7e27 100644
--- a/intern/mantaflow/intern/FLUID.h
+++ b/intern/mantaflow/intern/FLUID.h
@@ -129,7 +129,7 @@ public:
 	
 	static std::atomic<bool> mantaInitialized;
 	static std::atomic<int> solverID;
-	static int DEBUG; // on or off (1 or 0), also sets manta debug level
+	static int with_debug; // on or off (1 or 0), also sets manta debug level
 	
 	// Liquid getters
 	inline int getNumVertices()  { return mNumVertices; }