Compare commits

..

No commits in common. "889f01a7243b0c6af7b3483947ea2cea8b01add4" and "654787fa0d536ec3d69114bd697cb6fe496ce060" have entirely different histories.

3 changed files with 9 additions and 9 deletions

View file

@ -69,9 +69,9 @@ public static unsafe class MaterialService
return null;
var material = (MaterialResourceHandle*) model.AsCharacterBase->MaterialsSpan[index].Value;
if (material == null || material->DataSet == null)
if (material == null || material->ColorTable == null)
return null;
return (ColorTable.Table*)material->DataSet;
return (ColorTable.Table*)material->ColorTable;
}
}

View file

@ -69,13 +69,13 @@ public sealed unsafe class PrepareColorSet
public static bool TryGetColorTable(MaterialResourceHandle* material, StainIds stainIds,
out ColorTable.Table table)
{
if (material->DataSet == null)
if (material->ColorTable == null)
{
table = default;
return false;
}
var newTable = *(ColorTable.Table*)material->DataSet;
var newTable = *(ColorTable.Table*)material->ColorTable;
if (GetDyeTable(material, out var dyeTable))
{
if (stainIds.Stain1.Id != 0)

View file

@ -17,8 +17,8 @@
"Character"
],
"InternalName": "Glamourer",
"AssemblyVersion": "1.5.1.1",
"TestingAssemblyVersion": "1.5.1.1",
"AssemblyVersion": "1.5.1.0",
"TestingAssemblyVersion": "1.5.1.0",
"RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any",
"DalamudApiLevel": 13,
@ -27,9 +27,9 @@
"IsTestingExclusive": "False",
"DownloadCount": 1,
"LastUpdate": 1618608322,
"DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.1/Glamourer.zip",
"DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.1/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.1/Glamourer.zip",
"DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.0/Glamourer.zip",
"DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.0/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.0/Glamourer.zip",
"IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png"
}
]