Removed assert if creating texture atlas image fails; cancel creating image instead.
authorPerttu Ahola <celeron55@gmail.com>
Fri, 12 Aug 2011 14:17:47 +0000 (17:17 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Fri, 12 Aug 2011 14:17:47 +0000 (17:17 +0300)
src/tile.cpp

index 9f6a6eb72f57e68b194408ec846c9233e8b9f1c3..c93c0680b42ca838a6c50264a21677a3e65b9d30 100644 (file)
@@ -495,7 +495,13 @@ void TextureSource::buildMainAtlas()
        core::dimension2d<u32> atlas_dim(1024,1024);
        video::IImage *atlas_img =
                        driver->createImage(video::ECF_A8R8G8B8, atlas_dim);
-       assert(atlas_img);
+       //assert(atlas_img);
+       if(atlas_img == NULL)
+       {
+               dstream<<"TextureSource::buildMainAtlas(): Failed to create atlas "
+                               "image; not building texture atlas."<<std::endl;
+               return;
+       }
 
        /*
                A list of stuff to add. This should contain as much of the