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

Prevents crash on loading unrecognized resources. 

Editor crashes on trying to load resources with no loaders.
Simple check on the resource loader prevents using a null
resource loader.

Fixes: #27385
(cherry picked from commit 8ee31ace34)
This commit is contained in:
Anish 2019-03-25 02:27:02 +05:30 committed by Rémi Verschelde
parent 1d05568aed
commit f4578e1008
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); RES res = ResourceLoader::load(p_path);
ERR_FAIL_COND(res.is_null());
List<PropertyInfo> prop_list; List<PropertyInfo> prop_list;
get_edited_object()->get_property_list(&prop_list); get_edited_object()->get_property_list(&prop_list);
String property_types; String property_types;