Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #54072 from KoBeWi/hrcr_is_ded

Browse source
This commit is contained in:
Rémi Verschelde 2021-11-03 17:31:48 +01:00 • committed by GitHub
commit a2803f3d86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 42 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/editor_node.cpp
View file

@ -3356,7 +3356,7 @@ void EditorNode::set_edited_scene(Node *p_scene) {
if (p_scene) {
if (p_scene->get_parent() != scene_root) {
scene_root->add_child(p_scene);
scene_root->add_child(p_scene, true);
}
}
}
@ -3488,7 +3488,7 @@ void EditorNode::set_current_scene(int p_idx) {
if (new_scene) {
if (new_scene->get_parent() != scene_root) {
scene_root->add_child(new_scene);
scene_root->add_child(new_scene, true);
}
}
@ -7139,8 +7139,6 @@ EditorNode::EditorNode() {
_build_icon_type_cache();
Node::set_human_readable_collision_renaming(true);
pick_main_scene = memnew(ConfirmationDialog);
gui_base->add_child(pick_main_scene);
pick_main_scene->get_ok_button()->set_text(TTR("Select"));