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

Fix gloss and bug.

Browse source
This commit is contained in:
Ottermandias 2023-07-12 13:11:18 +02:00
parent 9e0c38169f
commit 0fb9e77c3c
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OtterGui

@ -1 +1 @@
Subproject commit e43a0f00661f319be27f606b1aa841d3234dfb0f Subproject commit f94bb0541e422a3e61a7117e8ad5bbba2f8ed6c0

4
Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.ColorSet.cs
View file

@ -97,7 +97,7 @@ public partial class ModEditWindow
private bool DrawPreviewDye( MtrlFile file, bool disabled ) private bool DrawPreviewDye( MtrlFile file, bool disabled )
{ {
var (dyeId, (name, dyeColor, _)) = _stainService.StainCombo.CurrentSelection; var (dyeId, (name, dyeColor, gloss)) = _stainService.StainCombo.CurrentSelection;
var tt = dyeId == 0 ? "Select a preview dye first." : "Apply all preview values corresponding to the dye template and chosen dye where dyeing is enabled."; var tt = dyeId == 0 ? "Select a preview dye first." : "Apply all preview values corresponding to the dye template and chosen dye where dyeing is enabled.";
if( ImGuiUtil.DrawDisabledButton( "Apply Preview Dye", Vector2.Zero, tt, disabled || dyeId == 0 ) ) if( ImGuiUtil.DrawDisabledButton( "Apply Preview Dye", Vector2.Zero, tt, disabled || dyeId == 0 ) )
{ {
@ -115,7 +115,7 @@ public partial class ModEditWindow
ImGui.SameLine(); ImGui.SameLine();
var label = dyeId == 0 ? "Preview Dye###previewDye" : $"{name} (Preview)###previewDye"; var label = dyeId == 0 ? "Preview Dye###previewDye" : $"{name} (Preview)###previewDye";
_stainService.StainCombo.Draw( label, dyeColor, string.Empty, true ); _stainService.StainCombo.Draw( label, dyeColor, string.Empty, true, gloss);
return false; return false;
} }

2
Penumbra/UI/ChangedItemDrawer.cs
View file

@ -280,7 +280,7 @@ public class ChangedItemDrawer : IDisposable
private object? Convert(object? data) private object? Convert(object? data)
{ {
if (data is EquipItem it) if (data is EquipItem it)
return _items.GetRow(it.Id); return _items.GetRow(it.ItemId);
return data; return data;
} }