[Bf-blender-cvs] [7227b9a] fluid-mantaflow: removed #if #end directives from fluid destructor

Sebastián Barschkis noreply at git.blender.org
Thu Jan 28 12:37:19 CET 2016


Commit: 7227b9ae1038819c6b9f91c530a73a0ebe485483
Author: Sebastián Barschkis
Date:   Sun Jan 3 02:53:21 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB7227b9ae1038819c6b9f91c530a73a0ebe485483

removed #if #end directives from fluid destructor

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

M	intern/smoke/intern/FLUID_3D.cpp

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

diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index 0cb3581..86505fc 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -223,6 +223,8 @@ void FLUID_3D::initFire()
 
 FLUID_3D::~FLUID_3D()
 {
+	cout << "~FLUID_3D" << endl;
+
 	if (_xVelocity) delete[] _xVelocity;
 	if (_yVelocity) delete[] _yVelocity;
 	if (_zVelocity) delete[] _zVelocity;
@@ -706,8 +708,7 @@ void FLUID_3D::initFire()
 FLUID_3D::~FLUID_3D()
 {
 	cout << "~FLUID_3D" << endl;
-// TODO: Get rid of all the initializations from FLUID_3D Manta constructor
-#if 0
+
 	if (_xVelocity) delete[] _xVelocity;
 	if (_yVelocity) delete[] _yVelocity;
 	if (_zVelocity) delete[] _zVelocity;
@@ -747,7 +748,6 @@ FLUID_3D::~FLUID_3D()
 	if (_color_b) delete[] _color_b;
 	if (_color_bOld) delete[] _color_bOld;
 	if (_color_bTemp) delete[] _color_bTemp;
-#endif
 
     // printf("deleted fluid\n");
 }




More information about the Bf-blender-cvs mailing list