Browse Source

Merge pull request #27388 from KidRigger/master

Prevents crash on loading unrecognized resources.
Rémi Verschelde 6 years ago
parent
commit
167d02ef61
1 changed files with 2 additions and 0 deletions
  1. 2 0
      editor/editor_properties.cpp

+ 2 - 0
editor/editor_properties.cpp

@@ -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;