Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 11:42:19 -08:00
parent 21d5e62f85 520c2b52d4
commit e44fa2a52a
17 changed files with 1 additions and 1185 deletions
@@ -690,7 +690,6 @@ namespace AssetBuilderSDK
    static const char* textureExtensions = ".dds";
    static const char* staticMeshExtensions = ".cgf";
    static const char* skinnedMeshExtensions = ".skin";
-    static const char* materialExtensions = ".mtl";

    // MIPS
    static const int c_MaxMipsCount = 11; // 11 is for 8k textures non-compressed. When not compressed it is using one file per mip.
@@ -805,11 +804,6 @@ namespace AssetBuilderSDK
            return textureAssetType;
        }

-        if (AzFramework::StringFunc::Find(materialExtensions, extension.c_str()) != AZStd::string::npos)
-        {
-            return materialAssetType;
-        }
-
        if (AzFramework::StringFunc::Find(staticMeshExtensions, extension.c_str()) != AZStd::string::npos)
        {
            return meshAssetType;