[Bf-blender-cvs] [a09387e] fluid-mantaflow: splitting up domain initialization. otherwise crashing

[Sebastián Barschkis]

Commit: a09387ee55236ac8308449a7d533f8b53550ccfa
Author: Sebastián Barschkis
Date:   Wed Jun 8 22:49:04 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBa09387ee55236ac8308449a7d533f8b53550ccfa

splitting up domain initialization. otherwise crashing

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

M       intern/mantaflow/intern/SMOKE.cpp

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

diff --git a/intern/mantaflow/intern/SMOKE.cpp 
b/intern/mantaflow/intern/SMOKE.cpp
index 53b4e75..4c41399 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -116,13 +116,11 @@ SMOKE::SMOKE(int *res, SmokeModifierData *smd)
        // Only start Mantaflow once. No need to start whenever new SMOKE 
objected is allocated
        if (!mantaInitialized)
                startMantaflow();
-
-       initDomain(smd);
-       if (mUsingHighRes) initDomainHigh(smd);
        
        // Initialize Mantaflow variables in Python
        // Liquid
        if (mUsingLiquid) {
+               initDomain(smd);
                initLiquid(smd);
                updatePointers(smd);
                return;
@@ -130,6 +128,7 @@ SMOKE::SMOKE(int *res, SmokeModifierData *smd)
        
        // Smoke
        if (mUsingSmoke) {
+               initDomain(smd);
                initSmoke(smd);
                if (mUsingHeat)   initHeat(smd);
                if (mUsingFire)   initFire(smd);
@@ -149,6 +148,7 @@ SMOKE::SMOKE(int *res, SmokeModifierData *smd)
                        mTotalCellsHigh = mResXHigh * mResYHigh * mResZHigh;
                        
                        // Initialize Mantaflow variables in Python
+                       initDomainHigh(smd);
                        initSmokeHigh(smd);
                        if (mUsingFire)   initFireHigh(smd);
                        if (mUsingColors) initColorsHigh(smd);

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