From 20f9bdc2098101ab560500c77befddf90c80936d Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 31 Mar 2021 10:12:05 +0200
Subject: [PATCH] Fix regression in adding model material slots

---
 Source/Editor/Windows/Assets/ModelWindow.cs       | 15 ++++++++++++---
 .../Editor/Windows/Assets/SkinnedModelWindow.cs   | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Source/Editor/Windows/Assets/ModelWindow.cs b/Source/Editor/Windows/Assets/ModelWindow.cs
index e8a054222..b16a01a73 100644
--- a/Source/Editor/Windows/Assets/ModelWindow.cs
+++ b/Source/Editor/Windows/Assets/ModelWindow.cs
@@ -399,9 +399,18 @@ namespace FlaxEditor.Windows.Assets
                             ShadowsCastingMode[] shadowsModes = new ShadowsCastingMode[value.Length];
                             for (int i = 0; i < value.Length; i++)
                             {
-                                materials[i] = value[i].Material;
-                                names[i] = value[i].Name;
-                                shadowsModes[i] = value[i].ShadowsMode;
+                                if (value[i] != null)
+                                {
+                                    materials[i] = value[i].Material;
+                                    names[i] = value[i].Name;
+                                    shadowsModes[i] = value[i].ShadowsMode;
+                                }
+                                else
+                                {
+                                    materials[i] = null;
+                                    names[i] = "Material " + i;
+                                    shadowsModes[i] = ShadowsCastingMode.All;
+                                }
                             }
 
                             Asset.SetupMaterialSlots(value.Length);
diff --git a/Source/Editor/Windows/Assets/SkinnedModelWindow.cs b/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
index b002aa0fe..f3d228f45 100644
--- a/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
+++ b/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
@@ -511,9 +511,18 @@ namespace FlaxEditor.Windows.Assets
                             ShadowsCastingMode[] shadowsModes = new ShadowsCastingMode[value.Length];
                             for (int i = 0; i < value.Length; i++)
                             {
-                                materials[i] = value[i].Material;
-                                names[i] = value[i].Name;
-                                shadowsModes[i] = value[i].ShadowsMode;
+                                if (value[i] != null)
+                                {
+                                    materials[i] = value[i].Material;
+                                    names[i] = value[i].Name;
+                                    shadowsModes[i] = value[i].ShadowsMode;
+                                }
+                                else
+                                {
+                                    materials[i] = null;
+                                    names[i] = "Material " + i;
+                                    shadowsModes[i] = ShadowsCastingMode.All;
+                                }
                             }
 
                             Asset.SetupMaterialSlots(value.Length);