summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2016-02-08 01:40:05 +0100
committerest31 <MTest31@outlook.com>2016-02-08 23:13:19 +0100
commit38e712260046f159aa201259569054bdf9793b7f (patch)
treea7e39e43109ea795ec3264752ccca660287ac130 /src
parentb44da4916aa09b27155ce6675cccbcc128b5a66c (diff)
downloadminetest-38e712260046f159aa201259569054bdf9793b7f.tar.gz
minetest-38e712260046f159aa201259569054bdf9793b7f.tar.bz2
minetest-38e712260046f159aa201259569054bdf9793b7f.zip
Use inventory_image in the first place for inventory item mesh
Diffstat (limited to 'src')
-rw-r--r--src/wieldmesh.cpp7
1 files 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) {