From e0336996ce2a593716f4f47ca5102077d397af94 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 17 Jan 2019 15:20:48 -0300 Subject: [PATCH] Add some checks to avoid disaster when making a node the scene root. Fixes #24484 --- editor/scene_tree_dock.cpp | 14 ++++++++++++++ scene/2d/canvas_item.cpp | 1 + 2 files changed, 15 insertions(+) diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index daa7f92dcf..be1c4a36bd 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -563,6 +563,20 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { if (node == root) return; + //check that from node to root, all owners are right + + if (node->get_owner() != root) { + accept->set_text(TTR("Node must belong to the edited scene to become root.")); + accept->popup_centered_minsize(); + return; + } + + if (node->get_filename() != String()) { + accept->set_text(TTR("Instantiated scenes can't become root")); + accept->popup_centered_minsize(); + return; + } + editor_data->get_undo_redo().create_action("Make node as Root"); editor_data->get_undo_redo().add_do_method(node->get_parent(), "remove_child", node); editor_data->get_undo_redo().add_do_method(root->get_parent(), "remove_child", root); diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 3aaed4fb27..6ed008cf9c 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -64,6 +64,7 @@ void CanvasItemMaterial::init_shaders() { void CanvasItemMaterial::finish_shaders() { memdelete(dirty_materials); + memdelete(shader_names); dirty_materials = NULL; #ifndef NO_THREADS