Update to minetest 5.4.0-dev

1 files changed, 21 insertions, 2 deletions

diff --git a/src/client/wieldmesh.cpp b/src/client/wieldmesh.cpp
index 2c6807fab..8cd3e29a9 100644
--- a/src/client/wieldmesh.cpp
+++ b/src/client/wieldmesh.cpp
@@ -347,7 +347,7 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, Client *client, bool che
 	scene::SMesh *mesh = nullptr;
 
 	if (m_enable_shaders) {
-		u32 shader_id = shdrsrc->getShader("wielded_shader", TILE_MATERIAL_BASIC, NDT_NORMAL);
+		u32 shader_id = shdrsrc->getShader("object_shader", TILE_MATERIAL_BASIC, NDT_NORMAL);
 		m_material_type = shdrsrc->getShaderInfo(shader_id).material;
 	}
 
@@ -467,10 +467,29 @@ void WieldMeshSceneNode::setColor(video::SColor c)
 			bc.getGreen() * green / 255,
 			bc.getBlue() * blue / 255);
 		scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-		colorizeMeshBuffer(buf, &buffercolor);
+
+		if (m_enable_shaders)
+			setMeshBufferColor(buf, buffercolor);
+		else
+			colorizeMeshBuffer(buf, &buffercolor);
 	}
 }
 
+void WieldMeshSceneNode::setNodeLightColor(video::SColor color)
+{
+	if (!m_meshnode)
+		return;
+
+	if (m_enable_shaders) {
+		for (u32 i = 0; i < m_meshnode->getMaterialCount(); ++i) {
+			video::SMaterial &material = m_meshnode->getMaterial(i);
+			material.EmissiveColor = color;
+		}
+	}
+
+	setColor(color);
+}
+
 void WieldMeshSceneNode::render()
 {
 	// note: if this method is changed to actually do something,