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

Merge pull request #106170 from IphStich/fix-typed-dictionary

Browse Source 
Fix for debugging typed dictionaries
This commit is contained in:
Thaddeus Crews
2025-05-09 11:29:18 -05:00
parent 0bf9d88797 057759d413
commit ba710dfde3
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/marshalls.cpp
View File

@ -1858,9 +1858,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
if (buf) { if (buf) {
buf += len; buf += len;
} }
const Variant *value = dict.getptr(kv.key); err = encode_variant(kv.value, buf, len, p_full_objects, p_depth + 1);
ERR_FAIL_NULL_V(value, ERR_BUG);
err = encode_variant(*value, buf, len, p_full_objects, p_depth + 1);
ERR_FAIL_COND_V(err, err); ERR_FAIL_COND_V(err, err);
ERR_FAIL_COND_V(len % 4, ERR_BUG); ERR_FAIL_COND_V(len % 4, ERR_BUG);
r_len += len; r_len += len;

2
editor/editor_properties_array_dict.cpp
View File

@ -1387,7 +1387,7 @@ void EditorPropertyDictionary::update_property() {
Variant::Type value_type; Variant::Type value_type;
if (dict.is_typed_value() && slot.prop_key) { if (dict.is_typed_value() && value_subtype != Variant::NIL && slot.prop_key) {
value_type = value_subtype; value_type = value_subtype;
} else { } else {
value_type = value.get_type(); value_type = value.get_type();