Fixed the incorrect namespace being assumed for collections

RoyTheunissen · RoyTheunissen · commit fcc8a789225a · 2025-05-24T11:44:33.000+02:00
diff --git a/Scripts/Editor/Core/CollectionSettings.cs b/Scripts/Editor/Core/CollectionSettings.cs
@@ -29,7 +29,7 @@ public CollectionSettings(ScriptableObjectCollection targetCollection)
         {
             Guid = targetCollection.GUID;
             string targetNamespace = targetCollection.GetItemType().Namespace;
-            if (!string.IsNullOrEmpty(SOCSettings.Instance.NamespacePrefix))
+            if (string.IsNullOrEmpty(targetNamespace) && !string.IsNullOrEmpty(SOCSettings.Instance.NamespacePrefix))
                 targetNamespace = $"{SOCSettings.Instance.NamespacePrefix}";
             
             Namespace = targetNamespace;
@@ -143,4 +143,4 @@ public void SetParentFolderPath(string assetPath)
             Save();
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public CollectionSettings(ScriptableObjectCollection targetCollection)`
`29`	`29`	`{`
`30`	`30`	`Guid = targetCollection.GUID;`
`31`	`31`	`string targetNamespace = targetCollection.GetItemType().Namespace;`
`32`		`- if (!string.IsNullOrEmpty(SOCSettings.Instance.NamespacePrefix))`
	`32`	`+ if (string.IsNullOrEmpty(targetNamespace) && !string.IsNullOrEmpty(SOCSettings.Instance.NamespacePrefix))`
`33`	`33`	`targetNamespace = $"{SOCSettings.Instance.NamespacePrefix}";`
`34`	`34`
`35`	`35`	`Namespace = targetNamespace;`
`@@ -143,4 +143,4 @@ public void SetParentFolderPath(string assetPath)`
`143`	`143`	`Save();`
`144`	`144`	`}`
`145`	`145`	`}`
`146`		`-}`
	`146`	`+}`