Merge branch 'master' of https://github.com/Norbyte/lslib

Norbyte · Apr 26, 2020 · 534ddb3 · 534ddb3
2 parents cca08f5 + 27a6a28
commit 534ddb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/LSLib/Granny/Model/Vertex.cs b/LSLib/Granny/Model/Vertex.cs
@@ -503,6 +503,11 @@ public VertexDescriptor ConstructDescriptor(MemberDefinition memberDefn, StructD
                         {
                             desc.ColorMapType = ColorMapType.Byte4;
                         }
+                        //Some Granny2 model formats report their color maps as UInt8 type instead of NormalUInt8, causing it to fail checks.
+                        else if (member.Type == MemberType.UInt8 && member.ArraySize == 4)
+                        {
+                            desc.ColorMapType = ColorMapType.Byte4;
+                        }
                         else
                         {
                             throw new Exception($"Unsupported color map type: {member.Type}, {member.ArraySize}");

diff --git a/LSLib/LS/Mods/ModResources.cs b/LSLib/LS/Mods/ModResources.cs
@@ -400,7 +400,7 @@ public void DiscoverModDirectory(string modName, string modPath, string publicPa
                 }
 
                 var typeCoercionWhitelistPath = modPath + @"\Story\RawFiles\TypeCoercionWhitelist.txt";
-                if (File.Exists(headerPath))
+                if (File.Exists(typeCoercionWhitelistPath))
                 {
                     var fileInfo = new FilesystemFileInfo
                     {