From 787cd15c14b65f50b06c6b9ccecf28e937318430 Mon Sep 17 00:00:00 2001
From: Rob Blanckaert <rob@withpiper.com>
Date: Sun, 22 Oct 2017 11:41:57 -0700
Subject: - Clear colors when reading property info. - Set vertex colors on
 upright_sprites.

---
 src/content_cao.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/content_cao.cpp')

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 9d87c733e..a8b4ae2e1 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1134,10 +1134,12 @@ 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);
-- 
cgit v1.2.3