diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-27 17:22:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 17:22:27 +0100 |
| commit | 167d02ef61c0048043c4720d0d8367587e4a0b42 (patch) | |
| tree | 36e9cace3106e976c3b7a38ed9c2647ff90b8937 /editor/editor_properties.cpp | |
| parent | 37969e71e484f3de3ca89d5b5fcba3679a95bfc5 (diff) | |
| parent | 8ee31ace34b3cd542fca2fe1b008d85ad20378ba (diff) | |
Merge pull request #27388 from KidRigger/master
Prevents crash on loading unrecognized resources.
Diffstat (limited to 'editor/editor_properties.cpp')
| -rw-r--r-- | editor/editor_properties.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index d7faa44441..2d0d212af9 100644 --- a/editor/editor_properties.cpp +++ b/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; |