From b3ace8f19746b53f839e7b0bdff0843c83866f64 Mon Sep 17 00:00:00 2001
From: Wuzzy <wuzzy2@mail.ru>
Date: Fri, 4 Sep 2020 20:49:50 +0200
Subject: [PATCH] Scale inventory image for scaled allfaces nodes (#10225)

The inventory image size of the inventory image of nodes with drawtype allfaces (and related) is scaled as well if visual_scale is set (previously, the inventory image size was always the same)
---
 games/devtest/mods/testnodes/drawtypes.lua | 9 +++++++++
 src/client/wieldmesh.cpp                   | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/games/devtest/mods/testnodes/drawtypes.lua b/games/devtest/mods/testnodes/drawtypes.lua
index 6bf57fa37..82d862819 100644
--- a/games/devtest/mods/testnodes/drawtypes.lua
+++ b/games/devtest/mods/testnodes/drawtypes.lua
@@ -514,6 +514,15 @@ local scale = function(subname, desc_double, desc_half)
 	minetest.register_node("testnodes:"..subname.."_half", def)
 end
 
+scale("allfaces",
+	S("Double-sized Allfaces Drawtype Test Node"),
+	S("Half-sized Allfaces Drawtype Test Node"))
+scale("allfaces_optional",
+	S("Double-sized Allfaces Optional Drawtype Test Node"),
+	S("Half-sized Allfaces Optional Drawtype Test Node"))
+scale("allfaces_optional_waving",
+	S("Double-sized Waving Allfaces Optional Drawtype Test Node"),
+	S("Half-sized Waving Allfaces Optional Drawtype Test Node"))
 scale("plantlike",
 	S("Double-sized Plantlike Drawtype Test Node"),
 	S("Half-sized Plantlike Drawtype Test Node"))
diff --git a/src/client/wieldmesh.cpp b/src/client/wieldmesh.cpp
index a268895ed..285cc38e5 100644
--- a/src/client/wieldmesh.cpp
+++ b/src/client/wieldmesh.cpp
@@ -562,6 +562,8 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
 			// add overlays
 			postProcessNodeMesh(mesh, f, false, false, nullptr,
 				&result->buffer_colors, true);
+			if (f.drawtype == NDT_ALLFACES)
+				scaleMesh(mesh, v3f(f.visual_scale));
 			break;
 		}
 		case NDT_PLANTLIKE: {