From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 12 Aug 2011 14:17:47 +0000 (+0300)
Subject: Removed assert if creating texture atlas image fails; cancel creating image instead.
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=835d2e4b5f92a5f9891fce8f958a4985cc53f1cf;p=zefram%2Fminetest%2Fminetest_engine.git

Removed assert if creating texture atlas image fails; cancel creating image instead.
---

diff --git a/src/tile.cpp b/src/tile.cpp
index 9f6a6eb7..c93c0680 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -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