From 38e712260046f159aa201259569054bdf9793b7f Mon Sep 17 00:00:00 2001
From: RealBadAngel <maciej.kasatkin@o2.pl>
Date: Mon, 8 Feb 2016 01:40:05 +0100
Subject: [PATCH] Use inventory_image in the first place for inventory item
mesh
---
src/wieldmesh.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
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) {
--
GitLab