From 3629651ef85b258d942ed90504fe1092b0e24a4f Mon Sep 17 00:00:00 2001
From: Marcus Brummer <mbrlabs7@gmail.com>
Date: Wed, 18 Nov 2020 00:12:32 +0100
Subject: [PATCH] Fixed deletion of nodes with exported node paths

---
 editor/scene_tree_dock.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index a569db7a1b3..ec225c3c380 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -1348,8 +1348,8 @@ void SceneTreeDock::perform_node_renames(Node *p_base, List<Pair<NodePath, NodeP
 							break;
 						}
 
-						// update if the node itself moved up/down the tree hirarchy
-						if (root_path == F->get().first) {
+						// update the node itself if it has a valid node path and has not been deleted
+						if (root_path == F->get().first && p != NodePath() && F->get().second != NodePath()) {
 							NodePath abs_path = NodePath(String(root_path).plus_file(p)).simplified();
 							NodePath rel_path_new = F->get().second.rel_path_to(abs_path);