Smoke: fixing some compile warning reported by Ton and one compile erro for gcc 4...
[blender.git] / intern / smoke / intern / FLUID_3D.cpp
index 3427b32e8882216bd8cde57392cbe1bee26c4d47..2822fca3607c31dc0cbaf0766fb8a2e6de8c8d80 100644 (file)
@@ -38,8 +38,8 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-FLUID_3D::FLUID_3D(int *res, int amplify, float *p0, float *p1, float dt) :
-       _xRes(res[0]), _yRes(res[1]), _zRes(res[2]), _res(0.), _dt(dt)
+FLUID_3D::FLUID_3D(int *res, int amplify, float *p0, float dt) :
+       _xRes(res[0]), _yRes(res[1]), _zRes(res[2]), _res(0.0f), _dt(dt)
 {
        // set simulation consts
        // _dt = dt; // 0.10
@@ -486,9 +486,11 @@ void FLUID_3D::setObstacleBoundaries()
                                const int down  = _obstacles[index - _xRes];
                                const int left  = _obstacles[index - 1];
                                const int right = _obstacles[index + 1];
-                               const bool fullz = (top && bottom);
-                               const bool fully = (up && down);
-                               const bool fullx = (left && right);
+
+                               // unused
+                               // const bool fullz = (top && bottom);
+                               // const bool fully = (up && down);
+                               //const bool fullx = (left && right);
 
                                _xVelocity[index] =
                                _yVelocity[index] =