From: RealBadAngel <maciej.kasatkin@o2.pl>
Date: Mon, 8 Feb 2016 00:40:05 +0000 (+0100)
Subject: Use inventory_image in the first place for inventory item mesh
X-Git-Tag: 0.4.14~283
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=38e712260046f159aa201259569054bdf9793b7f;p=oweals%2Fminetest.git

Use inventory_image in the first place for inventory item mesh
---

diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp
index 3e2483b5e..9c4d5b642 100644
--- a/src/wieldmesh.cpp
+++ b/src/wieldmesh.cpp
@@ -452,11 +452,8 @@ scene::IMesh *getItemMesh(IGameDef *gamedef, const ItemStack &item)
 
 	scene::IMesh *mesh;
 
-	// If wield_image is defined, it overrides everything else
-	if (def.wield_image != "") {
-		mesh = getExtrudedMesh(tsrc, def.wield_image);
-		return mesh;
-	} else if (def.inventory_image != "") {
+	// If inventory_image is defined, it overrides everything else
+	if (def.inventory_image != "") {
 		mesh = getExtrudedMesh(tsrc, def.inventory_image);
 		return mesh;
 	} else if (def.type == ITEM_NODE) {