Merge branch 'develop' into fix-mergecolor-operator-precedence

TheAssemblyArmada · Aug 11, 2024 · 49cf1ba · 49cf1ba
2 parents 9ab1e16 + fa47389
commit 49cf1ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/game/client/w3dassetmanager.cpp b/src/game/client/w3dassetmanager.cpp
@@ -401,7 +401,8 @@ TextureClass *GameAssetManager::Recolor_Texture_One_Time(TextureClass *texture,
     char buffer[512];
     Create_Color_Texture_Name(buffer, name, color);
     new_texture->Set_Texture_Name(buffer);
-    captainslog_dbgassert(!m_textureHash.Exists(new_texture), "Texture hash collision occurred"); // Thyme specific
+    captainslog_dbgassert(
+        !m_textureHash.Exists(new_texture->Get_Name()), "Texture hash collision occurred"); // Thyme specific
     m_textureHash.Insert(new_texture->Get_Name(), new_texture);
     new_texture->Add_Ref();
     Ref_Ptr_Release(surface);

diff --git a/src/w3d/renderer/assetmgr.cpp b/src/w3d/renderer/assetmgr.cpp
@@ -385,7 +385,8 @@ TextureClass *W3DAssetManager::Get_Texture(const char *filename,
                 return nullptr;
             }
 
-            captainslog_dbgassert(!m_textureHash.Exists(new_texture), "Texture hash collision occurred"); // Thyme specific
+            captainslog_dbgassert(
+                !m_textureHash.Exists(new_texture->Get_Name()), "Texture hash collision occurred"); // Thyme specific
             m_textureHash.Insert(new_texture->Get_Name(), new_texture);
         }