- Set dyeable byte appropriately if not already set when bringing in dye data.

Author: Lunaretic

xivModdingFramework/Materials/DataContainers/XivMtrl.cs

@@ -465,13 +465,16 @@ public void SetShaderInfo(ShaderInfo info, bool forced = false)
             {
                 TexturePathUnknownList[idx] = 0;
             }
+
             for (var idx = 0; idx < Unknown2.Length; idx++)
             {
-                Unknown2[idx] = 0;
-            }
-            if (Unknown2.Length > 0)
-            {
-                Unknown2[0] = 12;
+                if(idx == 0)
+                {
+                    Unknown2[idx] = 12;
+                } else
+                {
+                    Unknown2[idx] = 0;
+                } 
             }
         }
 

xivModdingFramework/Textures/FileTypes/Tex.cs

@@ -992,16 +992,16 @@ public async Task<int> TexColorImporter(XivMtrl xivMtrl, DirectoryInfo ddsFileDi
 
 
             colorSetData = GetColorsetDataFromDDS(ddsFileDirectory);
-
-            // If the colorset size is 544, it contains extra data that must be imported
-            if (xivMtrl.ColorSetDataSize == 544)
-            {
-                colorSetExtraData = GetColorsetExtraDataFromDDS(ddsFileDirectory);
-            }
+            colorSetExtraData = GetColorsetExtraDataFromDDS(ddsFileDirectory);
 
             // Replace the color set data with the imported data
             xivMtrl.ColorSetData = colorSetData;
             xivMtrl.ColorSetExtraData = colorSetExtraData;
+            if (xivMtrl.Unknown2.Length > 0)
+            {
+                // This byte enables the dye set if it's not already enabled.
+                xivMtrl.Unknown2[0] = 12;
+            }
 
             var mtrl = new Mtrl(_gameDirectory, xivMtrl.TextureTypePathList[0].DataFile, lang);
             return await mtrl.ImportMtrl(xivMtrl, item, source);
@@ -1110,6 +1110,12 @@ public byte[] DDStoMtrlData(XivMtrl xivMtrl, DirectoryInfo ddsFileDirectory, IIt
             xivMtrl.ColorSetData = colorSetData;
             xivMtrl.ColorSetExtraData = colorSetExtraData;
 
+            if (xivMtrl.Unknown2.Length > 0)
+            {
+                // This byte enables the dye set if it's not already enabled.
+                xivMtrl.Unknown2[0] = 12;
+            }
+
             var mtrl = new Mtrl(_gameDirectory, xivMtrl.TextureTypePathList[0].DataFile, lang);
             return mtrl.CreateMtrlFile(xivMtrl, item);
         }