ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-01-03 06:13:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dt-shmod

Browse source 
# Conflicts:
#	Penumbra/Communication/MtrlLoaded.cs
This commit is contained in:
Ottermandias 2024-08-07 15:45:24 +02:00
commit f0c034c84d
6 changed files with 93 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Interop/MaterialPreview/LiveColorTablePreviewer.cs
View file

@ -37,7 +37,7 @@ public sealed unsafe class LiveColorTablePreviewer : LiveMaterialPreviewerBase
_originalColorTableTexture = new SafeTextureHandle(*_colorTableTexture, true);
if (_originalColorTableTexture == null)
if (_originalColorTableTexture.Texture == null)
throw new InvalidOperationException("Material doesn't have a color table");
Width = (int)_originalColorTableTexture.Texture->Width;