[Bf-blender-cvs] [e248452] fluid-mantaflow: reverting to original fluid solver destructor. additional guards not needed.

Sebastián Barschkis noreply at git.blender.org
Fri Apr 1 22:13:40 CEST 2016


Commit: e248452b6c64f32194c2f5773e6d54c1ee51ccb7
Author: Sebastián Barschkis
Date:   Fri Apr 1 22:12:02 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBe248452b6c64f32194c2f5773e6d54c1ee51ccb7

reverting to original fluid solver destructor. additional guards not needed.

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

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 3dbf65b..fe09bdf 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() {
-	if (mGridsInt.used == 0) mGridsInt.free();
-	if (mGridsReal.used == 0) mGridsReal.free();
-	if (mGridsVec.used == 0) mGridsVec.free();
+	mGridsInt.free();
+	mGridsReal.free();
+	mGridsVec.free();
 }
 
 PbClass* FluidSolver::create(PbType t, PbTypeVec T, const string& name) {




More information about the Bf-blender-cvs mailing list