#5584: Use the entity colour for rendering the name.

codereader · Jan 24, 2022 · 546d152 · 546d152
1 parent 393c030
commit 546d152
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -15,6 +15,7 @@ class RenderableEntityName :
 private:
     const EntityNode& _entity;
     const NameKey& _nameKey;
+    Vector4 _colour;
 
 public:
     RenderableEntityName(const EntityNode& entity, const NameKey& nameKey) :