Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 21:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Tab Switching of Main Scene State. Closes #11045

Browse source
This commit is contained in:
Indah Sylvia 2017-09-09 04:45:04 +07:00
parent d1cb73b47a
commit 9e204658ff
1 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

47
editor/editor_node.cpp
View file

@ -2741,14 +2741,6 @@ Dictionary EditorNode::_get_main_scene_state() {
state["property_edit_offset"] = get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_value(); state["property_edit_offset"] = get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_value();
state["saved_version"] = saved_version; state["saved_version"] = saved_version;
state["node_filter"] = scene_tree_dock->get_filter(); state["node_filter"] = scene_tree_dock->get_filter();
int current = -1;
for (int i = 0; i < editor_table.size(); i++) {
if (editor_plugin_screen == editor_table[i]) {
current = i;
break;
}
}
state["editor_index"] = current;
return state; return state;
} }
@ -2759,29 +2751,32 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) {
changing_scene = false; changing_scene = false;
if (p_state.has("editor_index")) { int current = -1;
for (int i = 0; i < editor_table.size(); i++) {
int index = p_state["editor_index"]; if (editor_plugin_screen == editor_table[i]) {
int current = -1; current = i;
for (int i = 0; i < editor_table.size(); i++) { break;
if (editor_plugin_screen == editor_table[i]) {
current = i;
break;
}
} }
}
if (p_state.has("editor_index")) {
int index = p_state["editor_index"];
if (current < 2) { //if currently in spatial/2d, only switch to spatial/2d. if curently in script, stay there if (current < 2) { //if currently in spatial/2d, only switch to spatial/2d. if curently in script, stay there
if (index < 2 || !get_edited_scene()) { if (index < 2 || !get_edited_scene()) {
_editor_select(index); _editor_select(index);
} else { }
//use heuristic instead }
int n2d = 0, n3d = 0; }
_find_node_types(get_edited_scene(), n2d, n3d);
if (n2d > n3d) { if (get_edited_scene()) {
_editor_select(EDITOR_2D); if (current < 2) {
} else if (n3d > n2d) { //use heuristic instead
_editor_select(EDITOR_3D); int n2d = 0, n3d = 0;
} _find_node_types(get_edited_scene(), n2d, n3d);
if (n2d > n3d) {
_editor_select(EDITOR_2D);
} else if (n3d > n2d) {
_editor_select(EDITOR_3D);
} }
} }
} }