From 0fb9e77c3cff40d55dcd6a5dc297a4194d1c1b46 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Wed, 12 Jul 2023 13:11:18 +0200 Subject: [PATCH] Fix gloss and bug. --- OtterGui | 2 +- .../UI/AdvancedWindow/ModEditWindow.Materials.ColorSet.cs | 4 ++-- Penumbra/UI/ChangedItemDrawer.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OtterGui b/OtterGui index e43a0f00..f94bb054 160000 --- a/OtterGui +++ b/OtterGui @@ -1 +1 @@ -Subproject commit e43a0f00661f319be27f606b1aa841d3234dfb0f +Subproject commit f94bb0541e422a3e61a7117e8ad5bbba2f8ed6c0 diff --git a/Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.ColorSet.cs b/Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.ColorSet.cs index 26c7c2ae..cd599f11 100644 --- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.ColorSet.cs +++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.ColorSet.cs @@ -97,7 +97,7 @@ public partial class ModEditWindow 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."; if( ImGuiUtil.DrawDisabledButton( "Apply Preview Dye", Vector2.Zero, tt, disabled || dyeId == 0 ) ) { @@ -115,7 +115,7 @@ public partial class ModEditWindow ImGui.SameLine(); 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; } diff --git a/Penumbra/UI/ChangedItemDrawer.cs b/Penumbra/UI/ChangedItemDrawer.cs index c6a94542..41b5f420 100644 --- a/Penumbra/UI/ChangedItemDrawer.cs +++ b/Penumbra/UI/ChangedItemDrawer.cs @@ -280,7 +280,7 @@ public class ChangedItemDrawer : IDisposable private object? Convert(object? data) { if (data is EquipItem it) - return _items.GetRow(it.Id); + return _items.GetRow(it.ItemId); return data; }