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

Merge pull request #29433 from bojidar-bg/29406-dictionary-constant 

Properly catch certain errors in Dictionary and Array declarations
This commit is contained in:
Rémi Verschelde 2019-06-03 20:53:02 +02:00 committed by GitHub
parent 42569f566f b5bbedb45a
commit 8cc8383a7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_parser.cpp
View File

@ -6021,7 +6021,11 @@ bool GDScriptParser::_is_type_compatible(const DataType &p_container, const Data
} }
GDScriptParser::DataType GDScriptParser::_reduce_node_type(Node *p_node) { GDScriptParser::DataType GDScriptParser::_reduce_node_type(Node *p_node) {
#ifdef DEBUG_ENABLED
if (p_node->get_datatype().has_type && p_node->type != Node::TYPE_ARRAY && p_node->type != Node::TYPE_DICTIONARY) {
#else
if (p_node->get_datatype().has_type) { if (p_node->get_datatype().has_type) {
#endif
return p_node->get_datatype(); return p_node->get_datatype();
} }