[Bf-blender-cvs] [ee4c494] fluid-mantaflow: added guards in fluid solver destructor

Sebastián Barschkis noreply at git.blender.org
Thu Mar 24 01:35:58 CET 2016


Commit: ee4c49462a2eed4c7f57442c416079c0eb9d71e8
Author: Sebastián Barschkis
Date:   Thu Mar 24 01:35:29 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBee4c49462a2eed4c7f57442c416079c0eb9d71e8

added guards in fluid solver destructor

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

M	intern/mantaflow/intern/manta_pp/fluidsolver.cpp

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

diff --git a/intern/mantaflow/intern/manta_pp/fluidsolver.cpp b/intern/mantaflow/intern/manta_pp/fluidsolver.cpp
index fe09bdf..3dbf65b 100644
--- a/intern/mantaflow/intern/manta_pp/fluidsolver.cpp
+++ b/intern/mantaflow/intern/manta_pp/fluidsolver.cpp
@@ -92,9 +92,9 @@ FluidSolver::FluidSolver(Vec3i gridsize, int dim)
 }
 
 FluidSolver::~FluidSolver() {
-	mGridsInt.free();
-	mGridsReal.free();
-	mGridsVec.free();
+	if (mGridsInt.used == 0) mGridsInt.free();
+	if (mGridsReal.used == 0) mGridsReal.free();
+	if (mGridsVec.used == 0) mGridsVec.free();
 }
 
 PbClass* FluidSolver::create(PbType t, PbTypeVec T, const string& name) {




More information about the Bf-blender-cvs mailing list