diff --git a/source/CjClutter.ObjLoader.Loader/Common/StringExtensions.cs b/source/CjClutter.ObjLoader.Loader/Common/StringExtensions.cs index f9d5e36..c634c2d 100644 --- a/source/CjClutter.ObjLoader.Loader/Common/StringExtensions.cs +++ b/source/CjClutter.ObjLoader.Loader/Common/StringExtensions.cs @@ -20,6 +20,11 @@ public static bool EqualsOrdinalIgnoreCase(this string str, string s) return str.Equals(s, StringComparison.OrdinalIgnoreCase); } + public static bool EqualsOrdinal(this string str, string s) + { + return str.Equals(s, StringComparison.Ordinal); + } + public static bool IsNullOrEmpty(this string str) { return string.IsNullOrEmpty(str); diff --git a/source/CjClutter.ObjLoader.Loader/Data/DataStore/DataStore.cs b/source/CjClutter.ObjLoader.Loader/Data/DataStore/DataStore.cs index 39fd6e5..3ce0403 100644 --- a/source/CjClutter.ObjLoader.Loader/Data/DataStore/DataStore.cs +++ b/source/CjClutter.ObjLoader.Loader/Data/DataStore/DataStore.cs @@ -86,7 +86,8 @@ public void Push(Material material) public void SetMaterial(string materialName) { - var material = _materials.SingleOrDefault(x => x.Name.EqualsOrdinalIgnoreCase(materialName)); + var material = _materials.SingleOrDefault(x => x.Name.EqualsOrdinal(materialName)) ?? + _materials.SingleOrDefault(x => x.Name.EqualsOrdinalIgnoreCase(materialName)); PushGroupIfNeeded(); _currentGroup.Material = material; }