From 546d152dc75b286b78ba671e6a1bfe348770f45f Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Mon, 24 Jan 2022 11:49:57 +0100
Subject: [PATCH] #5584: Use the entity colour for rendering the name.

---
 radiantcore/entity/RenderableEntityName.cpp | 6 ++++--
 radiantcore/entity/RenderableEntityName.h   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/radiantcore/entity/RenderableEntityName.cpp b/radiantcore/entity/RenderableEntityName.cpp
index 8e68316fe5..1693ec42fd 100644
--- a/radiantcore/entity/RenderableEntityName.cpp
+++ b/radiantcore/entity/RenderableEntityName.cpp
@@ -16,8 +16,10 @@ const std::string& RenderableEntityName::getText()
 
 const Vector4& RenderableEntityName::getColour()
 {
-    static Vector4 colour(1, 1, 1, 1);
-    return colour;
+    // Keep the local copy up to date by querying the owning entity every time
+    _colour = _entity.getEntityColour();
+
+    return _colour;
 }
 
 }
diff --git a/radiantcore/entity/RenderableEntityName.h b/radiantcore/entity/RenderableEntityName.h
index 1d458fa569..ea1e287b7a 100644
--- a/radiantcore/entity/RenderableEntityName.h
+++ b/radiantcore/entity/RenderableEntityName.h
@@ -15,6 +15,7 @@ class RenderableEntityName :
 private:
     const EntityNode& _entity;
     const NameKey& _nameKey;
+    Vector4 _colour;
 
 public:
     RenderableEntityName(const EntityNode& entity, const NameKey& nameKey) :