added cases to handle Copy and Rename for scenegraphs correctly

alphafork · Aug 27, 2022 · b23e769 · b23e769
1 parent 37680da
commit b23e769
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Scripts/Editor/NodeGraphEditor.cs b/Scripts/Editor/NodeGraphEditor.cs
@@ -221,7 +221,7 @@ public virtual XNode.Node CopyNode(XNode.Node original) {
             XNode.Node node = target.CopyNode(original);
             Undo.RegisterCreatedObjectUndo(node, "Duplicate Node");
             node.name = original.name;
-            AssetDatabase.AddObjectToAsset(node, target);
+            if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(target))) AssetDatabase.AddObjectToAsset(node, target);
             if (NodeEditorPreferences.GetSettings().autoSave) AssetDatabase.SaveAssets();
             return node;
         }

diff --git a/Scripts/Editor/RenamePopup.cs b/Scripts/Editor/RenamePopup.cs
@@ -53,8 +53,10 @@ private void OnGUI() {
                 if (GUILayout.Button("Revert to default") || (e.isKey && e.keyCode == KeyCode.Return)) {
                     target.name = NodeEditorUtilities.NodeDefaultName(target.GetType());
                     NodeEditor.GetEditor((XNode.Node)target, NodeEditorWindow.current).OnRename();
-                    AssetDatabase.SetMainObject((target as XNode.Node).graph, AssetDatabase.GetAssetPath(target));
-                    AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
+                    if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(target))) {
+                        AssetDatabase.SetMainObject((target as XNode.Node).graph, AssetDatabase.GetAssetPath(target));
+                        AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
+                    }
                     Close();
                     target.TriggerOnValidate();
                 }
@@ -64,8 +66,10 @@ private void OnGUI() {
                 if (GUILayout.Button("Apply") || (e.isKey && e.keyCode == KeyCode.Return)) {
                     target.name = input;
                     NodeEditor.GetEditor((XNode.Node)target, NodeEditorWindow.current).OnRename();
-                    AssetDatabase.SetMainObject((target as XNode.Node).graph, AssetDatabase.GetAssetPath(target));
-                    AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
+                    if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(target))) {
+                        AssetDatabase.SetMainObject((target as XNode.Node).graph, AssetDatabase.GetAssetPath(target));
+                        AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(target));
+                    }
                     Close();
                     target.TriggerOnValidate();
                 }