[Bf-blender-cvs] [96fa613639f] blender-v2.82-release: Fix T73311: Mantaflow > Liquid: Enabling Initial Velocity on Inflow / Outflow crashes Blender
Sebastián Barschkis
noreply at git.blender.org
Wed Jan 22 11:40:25 CET 2020
Commit: 96fa613639f1755cbcf25e62a36450bd95a023a9
Author: Sebastián Barschkis
Date: Wed Jan 22 11:40:04 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB96fa613639f1755cbcf25e62a36450bd95a023a9
Fix T73311: Mantaflow > Liquid: Enabling Initial Velocity on Inflow / Outflow crashes Blender
===================================================================
M intern/mantaflow/intern/MANTA_main.cpp
===================================================================
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(
More information about the Bf-blender-cvs
mailing list