#5721: Return the default material if the active one is empty

codereader · Aug 22, 2021 · 77aa7eb · 77aa7eb
1 parent be38aeb
commit 77aa7eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/radiantcore/model/StaticModelSurface.cpp b/radiantcore/model/StaticModelSurface.cpp
@@ -248,7 +248,7 @@ void StaticModelSurface::setDefaultMaterial(const std::string& defaultMaterial)
 
 const std::string& StaticModelSurface::getActiveMaterial() const
 {
-	return _activeMaterial;
+    return !_activeMaterial.empty() ? _activeMaterial : _defaultMaterial;
 }
 
 void StaticModelSurface::setActiveMaterial(const std::string& activeMaterial)

diff --git a/radiantcore/model/md5/MD5Surface.cpp b/radiantcore/model/md5/MD5Surface.cpp
@@ -269,7 +269,7 @@ const std::string& MD5Surface::getDefaultMaterial() const
 
 const std::string& MD5Surface::getActiveMaterial() const
 {
-	return _activeMaterial;
+	return !_activeMaterial.empty() ? _activeMaterial : _originalShaderName;
 }
 
 void MD5Surface::setActiveMaterial(const std::string& activeMaterial)