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

Merge pull request #18061 from Chaosus/fixbug 

Fix crash when click on any inspector entry that takes Resource
This commit is contained in:
Poommetee Ketson 2018-04-09 00:23:42 +07:00 committed by GitHub
parent 2f4f8de459 56a6d90f36
commit 9acc199bf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/property_editor.cpp
View File

@ -882,7 +882,12 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
} else if (hint_text != "") { } else if (hint_text != "") {
int idx = 0; int idx = 0;
const Vector<EditorData::CustomType> custom_resources = EditorNode::get_editor_data().get_custom_types()["Resource"]; Vector<EditorData::CustomType> custom_resources;
if (EditorNode::get_editor_data().get_custom_types().has("Resource")) {
custom_resources = EditorNode::get_editor_data().get_custom_types()["Resource"];
}
for (int i = 0; i < hint_text.get_slice_count(","); i++) { for (int i = 0; i < hint_text.get_slice_count(","); i++) {
String base = hint_text.get_slice(",", i); String base = hint_text.get_slice(",", i);