mirror of
https://github.com/Ottermandias/Glamourer.git
synced 2025-12-12 18:27:24 +01:00
Compare commits
No commits in common. "414bd8bee7d1d738290014d726b730baae0f8385" and "889f01a7243b0c6af7b3483947ea2cea8b01add4" have entirely different histories.
414bd8bee7
...
889f01a724
3 changed files with 8 additions and 7 deletions
|
|
@ -1,5 +1,6 @@
|
|||
using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
|
||||
using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
|
||||
using Lumina.Data.Files;
|
||||
using Penumbra.GameData.Files.MaterialStructs;
|
||||
using Penumbra.GameData.Interop;
|
||||
using Texture = FFXIVClientStructs.FFXIV.Client.Graphics.Kernel.Texture;
|
||||
|
|
@ -68,7 +69,7 @@ public static unsafe class MaterialService
|
|||
return null;
|
||||
|
||||
var material = (MaterialResourceHandle*) model.AsCharacterBase->MaterialsSpan[index].Value;
|
||||
if (material == null || material->DataSet == null || material->DataSetSize < sizeof(ColorTable.Table) || !material->HasColorTable)
|
||||
if (material == null || material->DataSet == null)
|
||||
return null;
|
||||
|
||||
return (ColorTable.Table*)material->DataSet;
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ public sealed unsafe class PrepareColorSet
|
|||
public static bool TryGetColorTable(MaterialResourceHandle* material, StainIds stainIds,
|
||||
out ColorTable.Table table)
|
||||
{
|
||||
if (material->DataSet == null || material->DataSetSize < sizeof(ColorTable.Table) || !material->HasColorTable)
|
||||
if (material->DataSet == null)
|
||||
{
|
||||
table = default;
|
||||
return false;
|
||||
|
|
|
|||
10
repo.json
10
repo.json
|
|
@ -17,8 +17,8 @@
|
|||
"Character"
|
||||
],
|
||||
"InternalName": "Glamourer",
|
||||
"AssemblyVersion": "1.5.1.2",
|
||||
"TestingAssemblyVersion": "1.5.1.2",
|
||||
"AssemblyVersion": "1.5.1.1",
|
||||
"TestingAssemblyVersion": "1.5.1.1",
|
||||
"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.2/Glamourer.zip",
|
||||
"DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.2/Glamourer.zip",
|
||||
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.2/Glamourer.zip",
|
||||
"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",
|
||||
"IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png"
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue