]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Initialize wield mesh colors when changing item. (#12254)
authorx2048 <codeforsmile@gmail.com>
Sun, 1 May 2022 15:21:00 +0000 (17:21 +0200)
committerGitHub <noreply@github.com>
Sun, 1 May 2022 15:21:00 +0000 (17:21 +0200)
Fixes #12245

src/client/wieldmesh.cpp

index ab6fc9281a1883f45b61e13122fa4f6b01f642a0..d5c1919351d0c4436365e01aaae5d6108e591c9b 100644 (file)
@@ -457,6 +457,10 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, Client *client, bool che
                        material.setFlag(video::EMF_BILINEAR_FILTER, m_bilinear_filter);
                        material.setFlag(video::EMF_TRILINEAR_FILTER, m_trilinear_filter);
                }
+
+               // initialize the color
+               if (!m_lighting)
+                       setColor(video::SColor(0xFFFFFFFF));
                return;
        } else {
                if (!def.inventory_image.empty()) {
@@ -469,6 +473,10 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, Client *client, bool che
                m_colors.emplace_back();
                // overlay is white, if present
                m_colors.emplace_back(true, video::SColor(0xFFFFFFFF));
+
+               // initialize the color
+               if (!m_lighting)
+                       setColor(video::SColor(0xFFFFFFFF));
                return;
        }