diff options
| author | Danila Shutov <dcbrwn2@gmail.com> | 2020-06-09 22:38:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 21:38:09 +0200 |
| commit | fe3e69eb4029626cd7ef3f7a1c2beaec13ba7364 (patch) | |
| tree | 238d4eafd2a4ada76f79f0810c77c546a1b35a8f /src/client/wieldmesh.cpp | |
| parent | 7148834440d10bc211628aa2652e31166bdd58a0 (diff) | |
| download | minetest-fe3e69eb4029626cd7ef3f7a1c2beaec13ba7364.tar.gz minetest-fe3e69eb4029626cd7ef3f7a1c2beaec13ba7364.tar.bz2 minetest-fe3e69eb4029626cd7ef3f7a1c2beaec13ba7364.zip | |
Fix broken coloring of wielditems (#9969)
Fixes a regression that appeared in 5.3.0-dev.
Diffstat (limited to 'src/client/wieldmesh.cpp')
| -rw-r--r-- | src/client/wieldmesh.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/client/wieldmesh.cpp b/src/client/wieldmesh.cpp index 997eb1b5b..8cd3e29a9 100644 --- a/src/client/wieldmesh.cpp +++ b/src/client/wieldmesh.cpp @@ -467,7 +467,11 @@ 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); } } @@ -481,9 +485,9 @@ void WieldMeshSceneNode::setNodeLightColor(video::SColor color) video::SMaterial &material = m_meshnode->getMaterial(i); material.EmissiveColor = color; } - } else { - setColor(color); } + + setColor(color); } void WieldMeshSceneNode::render() |