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

Make sure variant parser recognizes "nil" for compatibility with old engine.cfg style cofig. Closes #3531

This commit is contained in:
Juan Linietsky 2016-02-01 19:00:19 -03:00
parent cecb37a7a3
commit b587614653
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/variant_parser.cpp
View File

@ -542,7 +542,7 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
value=true; value=true;
else if (id=="false") else if (id=="false")
value=false; value=false;
else if (id=="null") else if (id=="null" || id=="nil")
value=Variant(); value=Variant();
else if (id=="Vector2"){ else if (id=="Vector2"){

4
scene/gui/control.cpp
View File

@ -1597,7 +1597,9 @@ bool Control::has_focus() const {
void Control::grab_focus() { void Control::grab_focus() {
ERR_FAIL_COND(!is_inside_tree()); if (!is_inside_tree()){
ERR_FAIL_COND(!is_inside_tree());
}
if (data.focus_mode==FOCUS_NONE) if (data.focus_mode==FOCUS_NONE)
return; return;