From 8887105ffda38d42eb7dd3958f574317d7ce2ca6 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 31 Aug 2012 17:58:55 +0300
Subject: Properly initialize baseimg for texture modifier
 [combine:WxH:X,Y=filename:X,Y=filename2

---
 src/tile.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tile.cpp b/src/tile.cpp
index 6dbe4c63a..a9ded3891 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1344,7 +1344,11 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
 			u32 h0 = stoi(sf.next(":"));
 			infostream<<"combined w="<<w0<<" h="<<h0<<std::endl;
 			core::dimension2d<u32> dim(w0,h0);
-			baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+			if(baseimg == NULL)
+			{
+				baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+				baseimg->fill(video::SColor(0,0,0,0));
+			}
 			while(sf.atend() == false)
 			{
 				u32 x = stoi(sf.next(","));
-- 
cgit v1.2.3