[Bf-blender-cvs] [ca58fa9] fluid-mantaflow: minor formatting cleanup

Sebastián Barschkis noreply at git.blender.org
Tue Apr 19 12:01:33 CEST 2016


Commit: ca58fa9a149661b7e7162289505ee15361e01092
Author: Sebastián Barschkis
Date:   Sun Apr 3 23:52:49 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBca58fa9a149661b7e7162289505ee15361e01092

minor formatting cleanup

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

M	intern/mantaflow/intern/MANTA.cpp

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

diff --git a/intern/mantaflow/intern/MANTA.cpp b/intern/mantaflow/intern/MANTA.cpp
index eff1e5b..05b3c5d 100644
--- a/intern/mantaflow/intern/MANTA.cpp
+++ b/intern/mantaflow/intern/MANTA.cpp
@@ -51,12 +51,12 @@ MANTA::MANTA(int *res, SmokeModifierData *smd)
 	smd->domain->manta_solver_res = 3; // Why do we need to set this explicitly? When not set, fluidsolver throws exception (occurs when loading a new .blend file)
 	
 	// General variables used for low and high res
-	std::string tmpScript = "";
+	std::string tmpScript   = "";
 	std::string finalScript = "";
 
-	mUsingHeat = smd->domain->active_fields & SM_ACTIVE_HEAT;
-	mUsingFire = smd->domain->active_fields & SM_ACTIVE_FIRE;
-	mUsingColors = smd->domain->active_fields & SM_ACTIVE_COLORS;
+	mUsingHeat    = smd->domain->active_fields & SM_ACTIVE_HEAT;
+	mUsingFire    = smd->domain->active_fields & SM_ACTIVE_FIRE;
+	mUsingColors  = smd->domain->active_fields & SM_ACTIVE_COLORS;
 	mUsingHighRes = smd->domain->flags & MOD_SMOKE_HIGHRES;
 	
 	// Make sure that string vector does not contain any previous commands
@@ -111,6 +111,7 @@ MANTA::MANTA(int *res, SmokeModifierData *smd)
 	mTextureV2      = NULL;
 	mTextureW2      = NULL;
 
+	// Only start Mantaflow once. No need to start whenever new MANTA objected is allocated
 	if (!mantaInitialized)
 		startMantaflow();
 	
@@ -331,9 +332,9 @@ MANTA::~MANTA()
 	}
 	
 	// Reset flags
-	mUsingHeat = false;
-	mUsingFire = false;
-	mUsingColors = false;
+	mUsingHeat    = false;
+	mUsingFire    = false;
+	mUsingColors  = false;
 	mUsingHighRes = false;	
 }




More information about the Bf-blender-cvs mailing list