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

Merge pull request #27388 from KidRigger/master 

Prevents crash on loading unrecognized resources.
This commit is contained in:
Rémi Verschelde 2019-03-27 17:22:27 +01:00 committed by GitHub
parent 37969e71e4 8ee31ace34
commit 167d02ef61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_properties.cpp
View File

@ -1982,6 +1982,8 @@ void EditorPropertyResource::_file_selected(const String &p_path) {
RES res = ResourceLoader::load(p_path);
ERR_FAIL_COND(res.is_null());
List<PropertyInfo> prop_list;
get_edited_object()->get_property_list(&prop_list);
String property_types;