From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 15 Nov 2011 11:22:29 +0000 (+0200)
Subject: Update inventory texture too
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=c1202a2ecca352d5491364877fbe11e509cda8d3;p=zefram%2Fminetest%2Fminetest_engine.git

Update inventory texture too
---

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index d589c5ec..57807449 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -64,6 +64,7 @@ void ContentFeatures::setInventoryTexture(std::string imgname,
 	
 	imgname += "^[forcesingle";
 	
+	inventory_texture_name = imgname;
 	inventory_texture = tsrc->getTextureRaw(imgname);
 }
 
@@ -84,6 +85,7 @@ void ContentFeatures::setInventoryTextureCube(std::string top,
 	imgname_full += left;
 	imgname_full += "{";
 	imgname_full += right;
+	inventory_texture_name = imgname_full;
 	inventory_texture = tsrc->getTextureRaw(imgname_full);
 }
 #endif
@@ -181,6 +183,10 @@ public:
 				if(f->special_material2)
 					f->special_material2->setTexture(0, f->special_atlas->atlas);
 			}
+			if(f->inventory_texture_name != ""){
+				f->inventory_texture =
+					tsrc->getTextureRaw(f->inventory_texture_name);
+			}
 		}
 #endif
 	}
diff --git a/src/nodedef.h b/src/nodedef.h
index 0430621e..a093cb79 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -113,6 +113,7 @@ struct ContentFeatures
 	*/
 	TileSpec tiles[6];
 	
+	std::string inventory_texture_name;
 	video::ITexture *inventory_texture;
 
 	// Used currently for flowing liquids