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 b9ec82e18f64f5123c62dc2485567e6e40531213..fd35a3a062d6b348fa58b7eb202de48d2d222409 100644 (file)
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -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();
@@ -433,9 +434,6 @@ video::ITexture *generateTextureFromMesh(scene::IMesh *mesh,
        }
 
        // Create render target texture
-       video::ITexture *oldtexture = driver->findTexture(texture_name.c_str());
-       if(oldtexture)
-               driver->removeTexture(oldtexture);
        video::ITexture *rtt = driver->addRenderTargetTexture(
                        dim, texture_name.c_str(), video::ECF_A8R8G8B8);
        if(rtt == NULL)
@@ -446,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();
@@ -481,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;
 }