Commit: 9516230a8a9a59eb065bcf3aa2c8e653c42f9943
Author: Sebastián Barschkis
Date: Mon Jun 13 14:13:01 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB9516230a8a9a59eb065bcf3aa2c8e653c42f9943
making maxres a public field
===================================================================
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 633cc30..2145b5a 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -67,8 +67,8 @@ SMOKE::SMOKE(int *res, SmokeModifierData *smd)
mResX = res[0];
mResY = res[1];
mResZ = res[2];
- int maxRes = MAX3(mResX, mResY, mResZ);
- mConstantScaling = 64.0f / maxRes;
+ mMaxRes = MAX3(mResX, mResY, mResZ);
+ mConstantScaling = 64.0f / mMaxRes;
mConstantScaling = (mConstantScaling < 1.0f) ? 1.0f :
mConstantScaling;
mTotalCells = mResX * mResY * mResZ;
diff --git a/intern/mantaflow/intern/SMOKE.h b/intern/mantaflow/intern/SMOKE.h
index ea98c7a..306c618 100644
--- a/intern/mantaflow/intern/SMOKE.h
+++ b/intern/mantaflow/intern/SMOKE.h
@@ -131,6 +131,7 @@ private:
int mResX;
int mResY;
int mResZ;
+ int mMaxRes;
int mResXHigh;
int mResYHigh;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
