maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12559 from Cradmon/filesystemDockFix

Browse source 
Fix to issue #12554, due to error in refactoring in PR #10261
This commit is contained in:
Rémi Verschelde 2017-11-01 12:45:08 +01:00 committed by GitHub
parent 58889102b6 93e8468d92
commit 584bc88834
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/filesystem_dock.cpp
View file

@ -595,10 +595,10 @@ void FileSystemDock::_select_file(int p_idx) {
current_path->set_text(path);
_push_to_history();
} else {
if (ResourceLoader::get_resource_type(path) == "PackedScene") {
editor->open_request(path);
if (ResourceLoader::get_resource_type(fpath) == "PackedScene") {
editor->open_request(fpath);
} else {
editor->load_resource(path);
editor->load_resource(fpath);
}
}
}