archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'rnaSmoke' into smokeTypes

Browse Source
This commit is contained in:
Sebastián Barschkis
2019-04-06 18:25:12 +02:00
parent 0be2660313 2d438ae53e
commit 3c00523eaa
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/mantaflow/intern/FLUID.cpp
View File

@@ -50,7 +50,7 @@
std::atomic<bool> FLUID::mantaInitialized(false);
std::atomic<int> FLUID::solverID(0);
int FLUID::with_debug(1);
int FLUID::with_debug(0);
FLUID::FLUID(int *res, SmokeModifierData *smd) : mCurrentID(++solverID)
{
@@ -192,7 +192,7 @@ FLUID::FLUID(int *res, SmokeModifierData *smd) : mCurrentID(++solverID)
mResXMesh = mUpresMesh * mResX;
mResYMesh = mUpresMesh * mResY;
mResZMesh = mUpresMesh * mResZ;
mTotalCellsMesh = mResXMesh * mResYMesh * mResZMesh;
mTotalCellsMesh = mResXMesh * mResYMesh * mResZMesh;
// Initialize Mantaflow variables in Python
initMesh(smd);
@@ -230,7 +230,7 @@ FLUID::FLUID(int *res, SmokeModifierData *smd) : mCurrentID(++solverID)
mResXNoise = amplify * mResX;
mResYNoise = amplify * mResY;
mResZNoise = amplify * mResZ;
mTotalCellsHigh = mResXNoise * mResYNoise * mResZNoise;
mTotalCellsHigh = mResXNoise * mResYNoise * mResZNoise;
// Initialize Mantaflow variables in Python
initNoise(smd);
@@ -548,8 +548,8 @@ FLUID::~FLUID()
tmpString += manta_import;
tmpString += fluid_delete_all;
// Safe to pass NULL argument since only looking up IDs
std::string finalString = parseScript(tmpString, NULL);
// Leave out smd argument in parseScript since only looking up IDs
std::string finalString = parseScript(tmpString);
pythonCommands.push_back(finalString);
runPythonString(pythonCommands);
}

2
intern/mantaflow/intern/FLUID.h
View File

@@ -361,7 +361,7 @@ private:
void runPythonString(std::vector<std::string> commands);
std::string getRealValue(const std::string& varName, SmokeModifierData *smd);
std::string parseLine(const std::string& line, SmokeModifierData *smd);
std::string parseScript(const std::string& setup_string, SmokeModifierData *smd);
std::string parseScript(const std::string& setup_string, SmokeModifierData *smd=NULL);
void updateMeshFromBobj(const char* filename);
void updateMeshFromObj(const char* filename);
void updateMeshFromUni(const char* filename);