#5623: Fix inherited properties having a big red block next to them w…

…hen in merge mode
codereader · Jun 2, 2021 · 9705022 · 9705022
1 parent 7637228
commit 9705022
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -1253,6 +1253,8 @@ void EntityInspector::addClassAttribute(const EntityClassAttribute& a)
 
         row[_columns.name] = grey;
         row[_columns.value] = grey;
+        row[_columns.oldValue] = std::string();
+        row[_columns.newValue] = std::string();
 
         row[_columns.isInherited] = true;
         row[_columns.hasHelpText] = hasDescription;