From 0754ea85a956e2973632d47ca3610b7f6e53cf86 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 17 Apr 2026 08:55:41 +0200
Subject: [PATCH] Fix material slot comboboxes update when editing model
 material slots

---
 .../Editor/Windows/Assets/ModelBaseWindow.cs  | 33 +++----------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/Source/Editor/Windows/Assets/ModelBaseWindow.cs b/Source/Editor/Windows/Assets/ModelBaseWindow.cs
index 09b4606c4..3046ea43b 100644
--- a/Source/Editor/Windows/Assets/ModelBaseWindow.cs
+++ b/Source/Editor/Windows/Assets/ModelBaseWindow.cs
@@ -112,12 +112,14 @@ namespace FlaxEditor.Windows.Assets
 
                 Window._isolateIndex = -1;
                 Window._highlightIndex = -1;
+                Window._meshProxy = this;
             }
 
             public override void OnClean()
             {
                 Window._isolateIndex = -1;
                 Window._highlightIndex = -1;
+                Window._meshProxy = null;
 
                 base.OnClean();
             }
@@ -402,40 +404,12 @@ namespace FlaxEditor.Windows.Assets
                                 slots[i].ShadowsMode = shadowsModes[i];
                             }
 
-                            UpdateMaterialSlotsUI();
+                            Window?._meshProxy?.UpdateMaterialSlotsUI();
                         }
                     }
                 }
             }
 
-            private readonly List<ComboBox> _materialSlotComboBoxes = new List<ComboBox>();
-
-            /// <summary>
-            /// Updates the material slots UI parts. Should be called after material slot rename.
-            /// </summary>
-            public void UpdateMaterialSlotsUI()
-            {
-                Window._skipEffectsGuiEvents = true;
-
-                // Generate material slots labels (with index prefix)
-                var slots = Asset.MaterialSlots;
-                var slotsLabels = new string[slots.Length];
-                for (int i = 0; i < slots.Length; i++)
-                {
-                    slotsLabels[i] = string.Format("[{0}] {1}", i, slots[i].Name);
-                }
-
-                // Update comboboxes
-                for (int i = 0; i < _materialSlotComboBoxes.Count; i++)
-                {
-                    var comboBox = _materialSlotComboBoxes[i];
-                    comboBox.SetItems(slotsLabels);
-                    comboBox.SelectedIndex = ((Mesh)comboBox.Tag).MaterialSlotIndex;
-                }
-
-                Window._skipEffectsGuiEvents = false;
-            }
-
             protected class ProxyEditor : ProxyEditorBase
             {
                 public override void Initialize(LayoutElementsContainer layout)
@@ -776,6 +750,7 @@ namespace FlaxEditor.Windows.Assets
         protected readonly Tabs _tabs;
         protected readonly ToolStripButton _saveButton;
 
+        private MeshesPropertiesProxyBase _meshProxy;
         protected ModelImportSettings _importSettings = new ModelImportSettings();
         protected bool _refreshOnLODsLoaded;
         protected bool _skipEffectsGuiEvents;