ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-12 10:17:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix staging incompatibility with CS.

Browse source
This commit is contained in:
Ottermandias 2025-08-26 11:54:00 +02:00
parent 654787fa0d
commit 6e62905fa7
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Glamourer/Interop/Material/MaterialService.cs
View file

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

4
Glamourer/Interop/Material/PrepareColorSet.cs
View file

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