Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-04-19 21:15:57 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-04-22 17:18:13 +0300
commitfdea3dd7e7109a814561e4a83ff3331badf04e24 (patch)
tree676f0cea8f1b3b944aa9cf38710997dbfdfec989 /intern/mantaflow/intern/MANTA_main.h
parentd19277c72f1a5acc08eefde9c6c05e2cd4358205 (diff)
Fluid: Fix for inconsistent behavior with flow and effector objects
Fixes issue with flow and effector objects which were not being used after resuming a bake job. This issue has been reported in T75729 and T75758.
Diffstat (limited to 'intern/mantaflow/intern/MANTA_main.h')
-rw-r--r--intern/mantaflow/intern/MANTA_main.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/mantaflow/intern/MANTA_main.h b/intern/mantaflow/intern/MANTA_main.h
index caac63d8e39..21946431f28 100644
--- a/intern/mantaflow/intern/MANTA_main.h
+++ b/intern/mantaflow/intern/MANTA_main.h
@@ -405,6 +405,10 @@ struct MANTA {
{
return mPhiOutIn;
}
+ inline float *getPhiOutStaticIn()
+ {
+ return mPhiOutStaticIn;
+ }
inline float *getPhi()
{
return mPhi;
@@ -844,6 +848,7 @@ struct MANTA {
float *mPhiObsStaticIn;
float *mPhiGuideIn;
float *mPhiOutIn;
+ float *mPhiOutStaticIn;
float *mPhi;
// Mesh fields