From: sfan5 <sfan5@live.de>
Date: Sun, 6 Oct 2019 11:45:31 +0000 (+0200)
Subject: Fix upright_sprite lighting when colors are set
X-Git-Tag: 5.1.0~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=825579b43d6454cc33607ab8eff4e896b003b801;p=oweals%2Fminetest.git

Fix upright_sprite lighting when colors are set

fixes #9020
---

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 934f4354e..a15c1cc0b 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -1264,18 +1264,19 @@ void GenericCAO::updateTextures(std::string mod)
 					buf->getMaterial().AmbientColor = m_prop.colors[1];
 					buf->getMaterial().DiffuseColor = m_prop.colors[1];
 					buf->getMaterial().SpecularColor = m_prop.colors[1];
-					setMeshColor(mesh, m_prop.colors[1]);
 				} else if (!m_prop.colors.empty()) {
 					buf->getMaterial().AmbientColor = m_prop.colors[0];
 					buf->getMaterial().DiffuseColor = 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_BILINEAR_FILTER, use_bilinear_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]);
 		}
 	}
 }