Merge pull request #94 from Unity-Technologies/bugfix/same-name-bundl…

…e-reparent Prevent reparenting folders/bundles onto a parent with a same named item
Unity-Technologies · Jul 9, 2018 · 5a8d705 · 5a8d705
2 parents 1dcd5b7 + 64b59d7
commit 5a8d705
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/Editor/AssetBundleModel/ABModelBundleInfo.cs b/Editor/AssetBundleModel/ABModelBundleInfo.cs
@@ -536,6 +536,12 @@ internal override void HandleReparent(string parentName, BundleFolderInfo newPar
             newName += m_Name.shortName;
             if (newName == m_Name.bundleName)
                 return;
+
+            if (newParent != null && newParent.GetChild(newName) != null)
+            {
+                Model.LogWarning("An item named '" + newName + "' already exists at this level in hierarchy.  If your desire is to merge bundles, drag one on top of the other.");
+                return;
+            }
 
             foreach (var asset in m_ConcreteAssets)
             {
@@ -884,6 +890,13 @@ internal override void HandleReparent(string parentName, BundleFolderInfo newPar
             newName += displayName;
             if (newName == m_Name.bundleName)
                 return;
+
+            if (newParent != null && newParent.GetChild(newName) != null)
+            {
+                Model.LogWarning("An item named '" + newName + "' already exists at this level in hierarchy.  If your desire is to merge bundles, drag one on top of the other.");
+                return;
+            }
+
             foreach (var child in m_Children)
             {
                 child.Value.HandleReparent(newName);
@@ -966,6 +979,13 @@ internal override void HandleReparent(string parentName, BundleFolderInfo newPar
             newName += displayName;
             if (newName == m_Name.bundleName)
                 return;
+
+            if (newParent != null && newParent.GetChild(newName) != null)
+            {
+                Model.LogWarning("An item named '" + newName + "' already exists at this level in hierarchy.  If your desire is to merge bundles, drag one on top of the other.");
+                return;
+            }
+
             foreach (var child in m_Children)
             {
                 child.Value.HandleReparent(parentName);