[Bf-blender-cvs] [c435b25] fluid-mantaflow: cleaned up liquid init and made it public

[Sebastián Barschkis]

Commit: c435b25a8eb68a7c0f856972960bea30717019dc
Author: Sebastián Barschkis
Date:   Sat Jun 4 11:10:49 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBc435b25a8eb68a7c0f856972960bea30717019dc

cleaned up liquid init and made it public

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

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 9c7c8be..e23707c 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -256,20 +256,22 @@ void SMOKE::initColorsHigh(SmokeModifierData *smd)
 
 void SMOKE::initLiquid(SmokeModifierData *smd)
 {
-       std::string tmpString = manta_import
-               + solver_low
-               + adaptive_time_stepping
-               + alloc_liquid
-               + liquid_variables
-               + prep_domain
-               + adaptive_step_liquid
-               + liquid_step;
-       std::string finalString = parseScript(tmpString, smd);
-       mCommands.clear();
-       mCommands.push_back(finalString);
+       if (!mPhi) {
+               std::string tmpString = manta_import
+                       + solver_low
+                       + adaptive_time_stepping
+                       + alloc_liquid
+                       + liquid_variables
+                       + prep_domain
+                       + adaptive_step_liquid
+                       + liquid_step;
+               std::string finalString = parseScript(tmpString, smd);
+               mCommands.clear();
+               mCommands.push_back(finalString);
 
-       runPythonString(mCommands);
-       mUsingLiquid = true;
+               runPythonString(mCommands);
+               mUsingLiquid = true;
+       }
 }
 
 void SMOKE::step(SmokeModifierData *smd)
diff --git a/intern/mantaflow/intern/SMOKE.h b/intern/mantaflow/intern/SMOKE.h
index 2487c67..68268eb 100644
--- a/intern/mantaflow/intern/SMOKE.h
+++ b/intern/mantaflow/intern/SMOKE.h
@@ -50,6 +50,7 @@ public:
        void initColors(struct SmokeModifierData *smd);
        void initFireHigh(struct SmokeModifierData *smd);
        void initColorsHigh(struct SmokeModifierData *smd);
+       void initLiquid(SmokeModifierData *smd);
        
        // Pointer transfer Mantaflow -> Blender
        void updatePointers(struct SmokeModifierData *smd);
@@ -179,7 +180,6 @@ private:
        
        void initSetup(struct SmokeModifierData *smd);
        void initSetupHigh(struct SmokeModifierData *smd);
-       void initLiquid(SmokeModifierData *smd);
        void startMantaflow();
        void runPythonString(std::vector<std::string> commands);
        std::string getRealValue(const std::string& varName, SmokeModifierData 
*smd);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs