Update libraries.

Glamourer/Api/ApiHelpers.cs

@@ -2,6 +2,7 @@
 using Glamourer.Designs;
 using Glamourer.State;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Services;
 using Penumbra.GameData.Actors;

Glamourer/Automation/AutoDesignManager.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Filesystem;
 using Penumbra.GameData.Actors;
 using Penumbra.GameData.Enums;

Glamourer/Configuration.cs

@@ -8,6 +8,7 @@ using Glamourer.Services;
 using Newtonsoft.Json;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Filesystem;
 using OtterGui.Widgets;
 using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;

Glamourer/Designs/DesignBase64Migration.cs

@@ -1,6 +1,7 @@
 using Glamourer.Api.Enums;
 using Glamourer.Services;
 using OtterGui;
+using OtterGui.Extensions;
 using Penumbra.GameData.DataContainers;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;

Glamourer/Designs/DesignColors.cs

@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 
 namespace Glamourer.Designs;
 

Glamourer/Designs/DesignManager.cs

@@ -8,7 +8,7 @@ using Glamourer.Interop.Penumbra;
 using Glamourer.Services;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using OtterGui;
+using OtterGui.Extensions;
 using Penumbra.GameData.DataContainers;
 using Penumbra.GameData.Enums;
 

Glamourer/Designs/Links/DesignLinkLoader.cs

@@ -1,6 +1,6 @@
 using Dalamud.Interface.ImGuiNotification;
-using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Services;
 using Notification = OtterGui.Classes.Notification;
 

Glamourer/GameData/CustomizeSet.cs

@@ -1,4 +1,5 @@
 using OtterGui;
+using OtterGui.Extensions;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;
 using Race = Penumbra.GameData.Enums.Race;

Glamourer/Gui/Customization/CustomizationDrawer.Icon.cs

@@ -3,6 +3,7 @@ using Glamourer.GameData;
 using Glamourer.Unlocks;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;

Glamourer/Gui/DesignCombo.cs

@@ -8,6 +8,7 @@ using Glamourer.Events;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Widgets;
 

Glamourer/Gui/Equipment/BonusItemCombo.cs

@@ -5,6 +5,7 @@ using ImGuiNET;
 using Lumina.Excel.Sheets;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Raii;
 using OtterGui.Widgets;

Glamourer/Gui/Equipment/EquipmentDrawer.cs

@@ -8,6 +8,7 @@ using Glamourer.Services;
 using Glamourer.Unlocks;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
 using OtterGui.Text.EndObjects;

Glamourer/Gui/Equipment/ItemCombo.cs

@@ -3,8 +3,8 @@ using Glamourer.Services;
 using Glamourer.Unlocks;
 using ImGuiNET;
 using Lumina.Excel.Sheets;
-using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Raii;
 using OtterGui.Text;

Glamourer/Gui/Equipment/WeaponCombo.cs

@@ -3,6 +3,7 @@ using Glamourer.Unlocks;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Raii;
 using OtterGui.Text;

Glamourer/Gui/Tabs/AutomationTab/HumanNpcCombo.cs

@@ -3,6 +3,7 @@ using Dalamud.Utility;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Custom;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Widgets;
 using Penumbra.GameData.DataContainers;

Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs

@@ -8,6 +8,7 @@ using Glamourer.Services;
 using Glamourer.Unlocks;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Raii;
 using OtterGui.Text;

Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs

@@ -5,6 +5,7 @@ using Glamourer.Events;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.Interop;
 using Penumbra.String;

Glamourer/Gui/Tabs/DebugTab/AutoDesignPanel.cs

@@ -1,6 +1,7 @@
 using Glamourer.Automation;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.Gui.Debug;
 

Glamourer/Gui/Tabs/DebugTab/DesignManagerPanel.cs

@@ -2,6 +2,7 @@
 using Glamourer.Designs;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Gui.Debug;

Glamourer/Gui/Tabs/DebugTab/DesignTesterPanel.cs

@@ -3,6 +3,7 @@ using Glamourer.Designs;
 using Glamourer.Services;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.DataContainers;
 using Penumbra.GameData.Enums;

Glamourer/Gui/Tabs/DebugTab/GlamourPlatePanel.cs

@@ -7,6 +7,7 @@ using Glamourer.Services;
 using Glamourer.State;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Text;
 using Penumbra.GameData;
 using Penumbra.GameData.Enums;

Glamourer/Gui/Tabs/DesignTab/DesignColorCombo.cs

@@ -1,6 +1,7 @@
 using Glamourer.Designs;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Widgets;
 

Glamourer/Gui/Tabs/DesignTab/ModAssociationsTab.cs

@@ -8,6 +8,7 @@ using Glamourer.State;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
 using OtterGui.Text.Widget;

Glamourer/Gui/Tabs/DesignTab/MultiDesignPanel.cs

@@ -4,6 +4,7 @@ using Glamourer.Designs;
 using Glamourer.Interop.Material;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
 using static Glamourer.Gui.Tabs.HeaderDrawer;

Glamourer/Gui/Tabs/NpcTab/NpcSelector.cs

@@ -1,6 +1,7 @@
 using Glamourer.GameData;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using ImGuiClip = OtterGui.ImGuiClip;
 

Glamourer/Interop/Material/UpdateColorSets.cs

@@ -8,7 +8,7 @@ public sealed class UpdateColorSets : FastHook<UpdateColorSets.Delegate>
 {
     public delegate void Delegate(Model model, uint unk);
 
-    private readonly ThreadLocal<Model> _updatingModel = new();
+    private readonly ThreadLocal<Model> _updatingModel = new(() => Model.Null);
 
     public UpdateColorSets(HookManager hooks)
         => Task = hooks.CreateHook<Delegate>("Update Color Sets", Sigs.UpdateColorSets, Detour, true);
@@ -17,7 +17,7 @@ public sealed class UpdateColorSets : FastHook<UpdateColorSets.Delegate>
     {
         _updatingModel.Value = model;
         Task.Result.Original(model, unk);
-        _updatingModel.Value = nint.Zero;
+        _updatingModel.Value = Model.Null;
     }
 
     public Model Get()

Glamourer/Services/CollectionOverrideService.cs

@@ -3,6 +3,7 @@ using Glamourer.Interop.Penumbra;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Filesystem;
 using OtterGui.Services;
 using Penumbra.GameData.Actors;

Glamourer/Services/CommandService.cs

@@ -12,6 +12,7 @@ using Glamourer.State;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Services;
 using Penumbra.GameData.Actors;
 using Penumbra.GameData.Enums;

Glamourer/State/FunModule.cs

@@ -7,6 +7,7 @@ using Glamourer.Services;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Interop;
 using Penumbra.GameData.Structs;

OtterGui

@@ -1 +1 @@
-Subproject commit f53fd227a242435ce44a9fe9c5e847d0ca788869
+Subproject commit d13d700796648f2a9279250052c4aa8ebeca221f

Penumbra.GameData

@@ -1 +1 @@
-Subproject commit e10d8f33a676ff4544d7ca05a93d555416f41222
+Subproject commit 62bbce5981e961a91322ca1a7d3bb5be25f67185