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-01-22 13:40:04 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-01-22 13:40:04 +0300
commit96fa613639f1755cbcf25e62a36450bd95a023a9 (patch)
treeeaf08a1a5745fec431a0f4541035babe722d3982 /intern/mantaflow
parentc4b5279bbca4db2ee88e0451fe6d41175e26719a (diff)
Fix T73311: Mantaflow > Liquid: Enabling Initial Velocity on Inflow / Outflow crashes Blender
Diffstat (limited to 'intern/mantaflow')
-rw-r--r--intern/mantaflow/intern/MANTA_main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index a1851da711a..05e6999c193 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -2569,6 +2569,8 @@ void MANTA::updatePointers()
pyObjectToString(callPythonFunction("y_guidevel" + solver_ext, func)));
mGuideVelocityZ = (float *)stringToPointer(
pyObjectToString(callPythonFunction("z_guidevel" + solver_ext, func)));
+ mNumGuide = (float *)stringToPointer(
+ pyObjectToString(callPythonFunction("numGuides" + solver_ext, func)));
}
if (mUsingInvel) {
mInVelocityX = (float *)stringToPointer(
@@ -2577,8 +2579,6 @@ void MANTA::updatePointers()
pyObjectToString(callPythonFunction("y_invel" + solver_ext, func)));
mInVelocityZ = (float *)stringToPointer(
pyObjectToString(callPythonFunction("z_invel" + solver_ext, func)));
- mNumGuide = (float *)stringToPointer(
- pyObjectToString(callPythonFunction("numGuides" + solver_ext, func)));
}
if (mUsingSmoke) {
mDensity = (float *)stringToPointer(