Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2025-03-21 17:52:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix upright_sprite lighting when colors are set

Browse Source 
fixes #9020
This commit is contained in:
sfan5
2019-10-06 13:45:31 +02:00
parent dee22104b7
commit 825579b43d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/content_cao.cpp
View File

@ -1264,18 +1264,19 @@ void GenericCAO::updateTextures(std::string mod)
buf->getMaterial().AmbientColor = m_prop.colors[1]; buf->getMaterial().AmbientColor = m_prop.colors[1];
buf->getMaterial().DiffuseColor = m_prop.colors[1]; buf->getMaterial().DiffuseColor = m_prop.colors[1];
buf->getMaterial().SpecularColor = m_prop.colors[1]; buf->getMaterial().SpecularColor = m_prop.colors[1];
setMeshColor(mesh, m_prop.colors[1]);
} else if (!m_prop.colors.empty()) { } else if (!m_prop.colors.empty()) {
buf->getMaterial().AmbientColor = m_prop.colors[0]; buf->getMaterial().AmbientColor = m_prop.colors[0];
buf->getMaterial().DiffuseColor = m_prop.colors[0]; buf->getMaterial().DiffuseColor = m_prop.colors[0];
buf->getMaterial().SpecularColor = m_prop.colors[0]; buf->getMaterial().SpecularColor = m_prop.colors[0];
setMeshColor(mesh, m_prop.colors[0]);
} }
buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter); buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter);
buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter); buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter);
buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter); buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
} }
// Set mesh color (only if lighting is disabled)
if (!m_prop.colors.empty() && m_glow < 0)
setMeshColor(mesh, m_prop.colors[0]);
} }
} }
} }