Merge remote-tracking branch 'Exter-N/patch-1'

Ottermandias · Ottermandias · commit b8a3a854bd20 · 2024-08-06T17:13:17.000+02:00
diff --git a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs
@@ -606,7 +606,7 @@ private bool DrawDye(ColorDyeTable dyeTable, DyePack? dyePack, int rowIdx)
         if (_stainService.GudTemplateCombo.Draw("##dyeTemplate", dye.Template.ToString(), string.Empty,
                 scalarSize + ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton))
         {
-            dye.Template = _stainService.LegacyTemplateCombo.CurrentSelection;
+            dye.Template = _stainService.GudTemplateCombo.CurrentSelection;
             ret          = true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ private bool DrawDye(ColorDyeTable dyeTable, DyePack? dyePack, int rowIdx)`
`606`	`606`	`if (_stainService.GudTemplateCombo.Draw("##dyeTemplate", dye.Template.ToString(), string.Empty,`
`607`	`607`	`scalarSize + ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton))`
`608`	`608`	`{`
`609`		`- dye.Template = _stainService.LegacyTemplateCombo.CurrentSelection;`
	`609`	`+ dye.Template = _stainService.GudTemplateCombo.CurrentSelection;`
`610`	`610`	`ret = true;`
`611`	`611`	`}`
`612`	`612`