minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-11-14 14:30:31 +01:00
Code Issues Releases Wiki Activity

Use inventory_image in the first place for inventory item mesh

Browse Source
This commit is contained in:
RealBadAngel 2016-02-08 01:40:05 +01:00 committed by est31
parent b44da4916a
commit 38e7122600
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wieldmesh.cpp
View File

@ -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) {