From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 1 Dec 2011 11:00:27 +0000 (+0200)
Subject: Fix getTextureRaw to always return an image that is not in the texture atlas and... 
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=1da3a8e24b3366179ff50c4bae170dec8bed0475;p=zefram%2Fminetest%2Fminetest_engine.git

Fix getTextureRaw to always return an image that is not in the texture atlas and fix plain "^[forcesingle" handling
---

diff --git a/src/tile.cpp b/src/tile.cpp
index 29c6b3e6..27454c32 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -332,7 +332,7 @@ public:
 	// Gets a separate texture
 	video::ITexture* getTextureRaw(const std::string &name)
 	{
-		AtlasPointer ap = getTexture(name);
+		AtlasPointer ap = getTexture(name + "^[forcesingle");
 		return ap.atlas;
 	}
 
@@ -1170,6 +1170,15 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
 		*/
 		if(part_of_name == "[forcesingle")
 		{
+			// If base image is NULL, create a random color
+			if(baseimg == NULL)
+			{
+				core::dimension2d<u32> dim(1,1);
+				baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+				assert(baseimg);
+				baseimg->setPixel(0,0, video::SColor(255,myrand()%256,
+						myrand()%256,myrand()%256));
+			}
 		}
 		/*
 			[crackN