godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

make json sub-dictionaries shared, fixes #2381

Browse Source
This commit is contained in:
Juan Linietsky
2015-12-31 17:56:51 -03:00
parent 565513fb89
commit 6b1849d29b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/json.cpp
View File

@@ -288,7 +288,7 @@ Error JSON::_parse_value(Variant &value,Token& token,const CharType *p_str,int &
if (token.type==TK_CURLY_BRACKET_OPEN) { if (token.type==TK_CURLY_BRACKET_OPEN) {
Dictionary d; Dictionary d(true);
Error err = _parse_object(d,p_str,index,p_len,line,r_err_str); Error err = _parse_object(d,p_str,index,p_len,line,r_err_str);
if (err) if (err)
return err; return err;
@@ -296,7 +296,7 @@ Error JSON::_parse_value(Variant &value,Token& token,const CharType *p_str,int &
return OK; return OK;
} else if (token.type==TK_BRACKET_OPEN) { } else if (token.type==TK_BRACKET_OPEN) {
Array a; Array a(true);
Error err = _parse_array(a,p_str,index,p_len,line,r_err_str); Error err = _parse_array(a,p_str,index,p_len,line,r_err_str);
if (err) if (err)
return err; return err;

1
tools/editor/array_property_edit.cpp
View File

@@ -92,6 +92,7 @@ bool ArrayPropertyEdit::_set(const StringName& p_name, const Variant& p_value){
_change_notify(); _change_notify();
return true; return true;
} }
} else if (pn.begins_with("indices")) { } else if (pn.begins_with("indices")) {
if (pn.find("_")!=-1) { if (pn.find("_")!=-1) {