Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams

[minetest.git] / src / mesh.cpp

diff --git a/src/mesh.cpp b/src/mesh.cpp
index d0d8b0a6ed83133b81d8a0648e1c63bb95ab06fb..fd35a3a062d6b348fa58b7eb202de48d2d222409 100644 (file)
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -246,6 +246,8 @@ static scene::IAnimatedMesh* extrudeARGB(u32 twidth, u32 theight, u8 *data)
                }
        }
 
+       delete[] solidity;
+
        // Add to mesh
        scene::SMesh *mesh = new scene::SMesh();
        mesh->addMeshBuffer(buf);
@@ -282,7 +284,6 @@ scene::IAnimatedMesh* createExtrudedMesh(video::ITexture *texture,
                if (img2 != NULL)
                {
                        img1->copyTo(img2);
-                       img1->drop();
 
                        mesh = extrudeARGB(size.Width, size.Height, (u8*) img2->lock());
                        img2->unlock();
@@ -443,7 +444,7 @@ video::ITexture *generateTextureFromMesh(scene::IMesh *mesh,
        }
 
        // Set render target
-       driver->setRenderTarget(rtt, true, true, video::SColor(0,0,0,0));
+       driver->setRenderTarget(rtt, false, true, video::SColor(0,0,0,0));
 
        // Get a scene manager
        scene::ISceneManager *smgr_main = device->getSceneManager();
@@ -478,7 +479,7 @@ video::ITexture *generateTextureFromMesh(scene::IMesh *mesh,
        smgr->drop();
 
        // Unset render target
-       driver->setRenderTarget(0, true, true, 0);
+       driver->setRenderTarget(0, false, true, 0);
 
        return rtt;
 }