godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the inherited scene root node unable to change type

Browse Source 
Make the inherited scene root behave like other children from the
inherited scene.
This commit is contained in:
风青山 2024-04-11 22:29:18 +08:00
parent 83b916bb00
commit e825a6fb01
No known key found for this signature in database
GPG Key ID: C06116835A98BFFF
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
editor/scene_tree_dock.cpp
View File

@ -2079,17 +2079,19 @@ bool SceneTreeDock::_validate_no_foreign() {
return false;
}
// When edited_scene inherits from another one the root Node will be the parent Scene,
// we don't want to consider that Node a foreign one otherwise we would not be able to
// delete it.
if (edited_scene->get_scene_inherited_state().is_valid() && edited_scene == E) {
continue;
}
if (edited_scene->get_scene_inherited_state().is_valid()) {
// When edited_scene inherits from another one the root Node will be the parent Scene,
// we don't want to consider that Node a foreign one otherwise we would not be able to
// delete it.
if (edited_scene == E && current_option != TOOL_REPLACE) {
continue;
}
if (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E)) >= 0) {
accept->set_text(TTR("Can't operate on nodes the current scene inherits from!"));
accept->popup_centered();
return false;
if (edited_scene == E || edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E)) >= 0) {
accept->set_text(TTR("Can't operate on nodes the current scene inherits from!"));
accept->popup_centered();
return false;
}
}
}
@ -3443,6 +3445,13 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
can_replace = false;
break;
}
if (edited_scene->get_scene_inherited_state().is_valid()) {
if (E == edited_scene || edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E)) >= 0) {
can_replace = false;
break;
}
}
}
if (can_replace) {