From 309302c212a0beba54fbe7a86ad07ffbcba6421d Mon Sep 17 00:00:00 2001 From: Ruan Lucas <79365912+RuanLucasGD@users.noreply.github.com> Date: Sun, 23 Apr 2023 10:00:26 -0400 Subject: [PATCH 1/2] improv: set new material instance name to parent material name --- Source/Editor/Content/Proxy/MaterialProxy.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Editor/Content/Proxy/MaterialProxy.cs b/Source/Editor/Content/Proxy/MaterialProxy.cs index 9cbd54975..c6a9755fc 100644 --- a/Source/Editor/Content/Proxy/MaterialProxy.cs +++ b/Source/Editor/Content/Proxy/MaterialProxy.cs @@ -75,8 +75,9 @@ namespace FlaxEditor.Content if (materialItem == null) throw new ArgumentNullException(); + var materialInstanceName = materialItem.FileName.Replace(".flax", " Instance"); var materialInstanceProxy = Editor.Instance.ContentDatabase.GetProxy(); - Editor.Instance.Windows.ContentWin.NewItem(materialInstanceProxy, null, item => OnMaterialInstanceCreated(item, materialItem)); + Editor.Instance.Windows.ContentWin.NewItem(materialInstanceProxy, null, item => OnMaterialInstanceCreated(item, materialItem), materialInstanceName); } private static void OnMaterialInstanceCreated(ContentItem item, BinaryAssetItem materialItem) From 65a68131cc405f03750c5232df038fc168ad394e Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 5 May 2023 11:38:28 +0200 Subject: [PATCH 2/2] Improve name construction in #1038 --- Source/Editor/Content/Proxy/MaterialProxy.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Editor/Content/Proxy/MaterialProxy.cs b/Source/Editor/Content/Proxy/MaterialProxy.cs index c6a9755fc..cf7c8b77e 100644 --- a/Source/Editor/Content/Proxy/MaterialProxy.cs +++ b/Source/Editor/Content/Proxy/MaterialProxy.cs @@ -72,10 +72,7 @@ namespace FlaxEditor.Content /// The material item to use as a base material. public static void CreateMaterialInstance(BinaryAssetItem materialItem) { - if (materialItem == null) - throw new ArgumentNullException(); - - var materialInstanceName = materialItem.FileName.Replace(".flax", " Instance"); + var materialInstanceName = materialItem.ShortName + " Instance"; var materialInstanceProxy = Editor.Instance.ContentDatabase.GetProxy(); Editor.Instance.Windows.ContentWin.NewItem(materialInstanceProxy, null, item => OnMaterialInstanceCreated(item, materialItem), materialInstanceName); }