From c920b75142d99a3cccbbec622d0c35de72a76041 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Mon, 24 Apr 2023 17:47:19 -0500
Subject: [PATCH] Fix collision assets creation in non asset folders.

---
 Source/Editor/Content/Proxy/CollisionDataProxy.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Content/Proxy/CollisionDataProxy.cs b/Source/Editor/Content/Proxy/CollisionDataProxy.cs
index 55e8c6327..e4a2381f0 100644
--- a/Source/Editor/Content/Proxy/CollisionDataProxy.cs
+++ b/Source/Editor/Content/Proxy/CollisionDataProxy.cs
@@ -141,7 +141,13 @@ namespace FlaxEditor.Content
                 });
             };
             var initialName = (modelItem?.ShortName ?? Path.GetFileNameWithoutExtension(model.Path)) + " Collision";
-            Editor.Instance.Windows.ContentWin.NewItem(this, null, create, initialName, withRenaming);
+            
+            // If folder can not have assets then move to folder with the model and create asset
+            var contentWin = Editor.Instance.Windows.ContentWin;
+            if (!contentWin.CurrentViewFolder.CanHaveAssets)
+                contentWin.Navigate(modelItem?.ParentFolder?.Node);
+            
+            contentWin.NewItem(this, null, create, initialName, withRenaming);
         }
     }
 }