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

Merge pull request #62986 from fire-forge/array-object

This commit is contained in:
Rémi Verschelde 2022-07-13 22:16:09 +02:00 committed by GitHub
parent 98d5b37a4c 0df23111b3
commit 4dc86f3b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_properties_array_dict.cpp
View File

@ -211,7 +211,14 @@ void EditorPropertyArray::update_property() {
String array_type_name = Variant::get_type_name(array_type);
if (array_type == Variant::ARRAY && subtype != Variant::NIL) {
array_type_name = vformat("%s[%s]", array_type_name, Variant::get_type_name(subtype));
String type_name;
if (subtype == Variant::OBJECT && subtype_hint == PROPERTY_HINT_RESOURCE_TYPE) {
type_name = subtype_hint_string;
} else {
type_name = Variant::get_type_name(subtype);
}
array_type_name = vformat("%s[%s]", array_type_name, type_name);
}
if (array.get_type() == Variant::NIL) {