TextureReplacement: remove old checks

Interkarma · Sep 7, 2017 · a9462ec · a9462ec
1 parent e8848f3
commit a9462ec
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/Assets/Scripts/Utility/RMBLayout.cs b/Assets/Scripts/Utility/RMBLayout.cs
@@ -228,7 +228,7 @@ public static GameObject CreateBaseGameObject(ref DFBlock blockData, int layoutX
                         continue;
 
                     // Add billboard to batch or standalone
-                    if ((billboardBatch != null) && (!TextureReplacement.CustomTextureExist(natureArchive, scenery.TextureRecord)))
+                    if (billboardBatch != null)
                     {
                         billboardBatch.AddItem(scenery.TextureRecord, billboardPosition);
                     }
@@ -276,7 +276,7 @@ public static GameObject CreateBaseGameObject(ref DFBlock blockData, int layoutX
                         continue;
 
                     // Add billboard to batch or standalone
-                    if ((billboardBatch != null) && (!TextureReplacement.CustomTextureExist(obj.TextureArchive, obj.TextureRecord)))
+                    if (billboardBatch != null)
                     {
                         billboardBatch.AddItem(obj.TextureRecord, billboardPosition);
                     }
@@ -325,27 +325,24 @@ public static GameObject CreateBaseGameObject(ref DFBlock blockData, int layoutX
                 if (MeshReplacement.ImportCustomFlatGameobject(obj.TextureArchive, obj.TextureRecord, billboardPosition, flatsParent) != null)
                     continue;
 
-                if (!TextureReplacement.CustomTextureExist(obj.TextureArchive, obj.TextureRecord))
+                // Use misc billboard atlas where available
+                if (miscBillboardsAtlas != null && miscBillboardsBatch != null)
                 {
-                    // Use misc billboard atlas where available
-                    if (miscBillboardsAtlas != null && miscBillboardsBatch != null)
+                    TextureAtlasBuilder.AtlasItem item = miscBillboardsAtlas.GetAtlasItem(obj.TextureArchive, obj.TextureRecord);
+                    if (item.key != -1)
                     {
-                        TextureAtlasBuilder.AtlasItem item = miscBillboardsAtlas.GetAtlasItem(obj.TextureArchive, obj.TextureRecord);
-                        if (item.key != -1)
-                        {
-                            miscBillboardsBatch.AddItem(item.rect, item.textureItem.size, item.textureItem.scale, billboardPosition);
-                            continue;
-                        }
-                    }
-
-                    // Add to batch where available
-                    if (obj.TextureArchive == TextureReader.AnimalsTextureArchive && animalsBillboardBatch != null)
-                    {
-                        animalsBillboardBatch.AddItem(obj.TextureRecord, billboardPosition);
+                        miscBillboardsBatch.AddItem(item.rect, item.textureItem.size, item.textureItem.scale, billboardPosition);
                         continue;
                     }
                 }
 
+                // Add to batch where available
+                if (obj.TextureArchive == TextureReader.AnimalsTextureArchive && animalsBillboardBatch != null)
+                {
+                    animalsBillboardBatch.AddItem(obj.TextureRecord, billboardPosition);
+                    continue;
+                }
+
                 // Add standalone billboard gameobject
                 GameObject go = GameObjectHelper.CreateDaggerfallBillboardGameObject(obj.TextureArchive, obj.TextureRecord, flatsParent);
                 go.transform.position = billboardPosition;