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>2021-01-10 21:09:37 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2021-01-10 21:16:44 +0300
commit30310a4fc84cd6b971f58ced42b6eed1343b22e7 (patch)
tree2b643cf4f9ed1f0bb94741402582029c00bac729 /intern/mantaflow/intern/MANTA_main.cpp
parent5b90ed6c06bf79f41d56666158f660513d8e1f04 (diff)
Fix T83777: Crash when enabling guides
Also adjusted adjusted guiding UI parameters so that guiding will not get invalidated when changing domain values.
Diffstat (limited to 'intern/mantaflow/intern/MANTA_main.cpp')
-rw-r--r--intern/mantaflow/intern/MANTA_main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index d5d41e71f22..1ed2b558938 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -1394,15 +1394,14 @@ bool MANTA::readGuiding(FluidModifierData *fmd, int framenr, bool sourceDomain)
if (with_debug)
cout << "MANTA::readGuiding()" << endl;
- FluidDomainSettings *fds = fmd->domain;
-
if (!mUsingGuiding)
return false;
- if (!fds)
+ if (!fmd)
return false;
ostringstream ss;
vector<string> pythonCommands;
+ FluidDomainSettings *fds = fmd->domain;
string directory = (sourceDomain) ? getDirectory(fmd, FLUID_DOMAIN_DIR_DATA) :
getDirectory(fmd, FLUID_DOMAIN_DIR_GUIDE);