[Bf-blender-cvs] [020d1e23aee] master: Fluid: Fix issue with mesh not being loaded

Sebastián Barschkis noreply at git.blender.org
Wed Apr 8 16:26:28 CEST 2020


Commit: 020d1e23aee934dfad5fabc4038362cb8adf6c2a
Author: Sebastián Barschkis
Date:   Wed Apr 8 16:25:00 2020 +0200
Branches: master
https://developer.blender.org/rB020d1e23aee934dfad5fabc4038362cb8adf6c2a

Fluid: Fix issue with mesh not being loaded

Fixed an issue that was likely introduced in a past cleanup.

===================================================================

M	intern/mantaflow/intern/MANTA_main.cpp

===================================================================

diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 293abae1b3a..79c8625ec48 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -1098,12 +1098,14 @@ bool MANTA::updateMeshStructures(FluidModifierData *mmd, int framenr)
   int expected = 0; /* Expected number of read successes for this frame. */
 
   /* Ensure empty data structures at start. */
-  if (!mMeshNodes || !mMeshTriangles || !mMeshVelocities)
+  if (!mMeshNodes || !mMeshTriangles)
     return false;
 
   mMeshNodes->clear();
   mMeshTriangles->clear();
-  mMeshVelocities->clear();
+
+  if (mMeshVelocities)
+    mMeshVelocities->clear();
 
   std::string mformat = getCacheFileEnding(mmd->domain->cache_mesh_format);
   std::string dformat = getCacheFileEnding(mmd->domain->cache_data_format);



More information about the Bf-blender-cvs mailing list