From 66d2cd3918134af4c9863d812ed960c586444897 Mon Sep 17 00:00:00 2001
From: Nikodem Lokatelj <nikodem.lokatelj@interblockgaming.com>
Date: Fri, 30 Mar 2018 14:49:21 +0200
Subject: [PATCH] perform_node_renames fix for a case where the new name is
 empty

---
 editor/scene_tree_dock.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index f86b00e17ab..37e06de9685 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -933,7 +933,13 @@ void SceneTreeDock::perform_node_renames(Node *p_base, List<Pair<NodePath, NodeP
 						NodePath root_path = p_base->get_path();
 
 						NodePath rel_path_old = root_path.rel_path_to(E->get().first);
-						NodePath rel_path_new = root_path.rel_path_to(E->get().second);
+
+						NodePath rel_path_new = E->get().second;
+
+						// if not empty, get new relative path
+						if (E->get().second != NodePath()) {
+							rel_path_new = root_path.rel_path_to(E->get().second);
+						}
 
 						// if old path detected, then it needs to be replaced with the new one
 						if (p == rel_path_old) {