diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-04 12:25:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 12:25:59 +0100 |
| commit | 425ec6914c40ed0654db16f417e80daa2a84cdd0 (patch) | |
| tree | 3b068d33d62b9a0b529ea837056b9f6d215af3f3 /modules/gdscript/gdscript_parser.h | |
| parent | 49d82f245bf11bd9064c9de24704cbec2181b5ba (diff) | |
Revert "Forbid implicit type conversion in GDScript"
Diffstat (limited to 'modules/gdscript/gdscript_parser.h')
| -rw-r--r-- | modules/gdscript/gdscript_parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index 167132e390..809bff8f20 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -607,7 +607,7 @@ private: Variant::Operator _get_variant_operation(const OperatorNode::Operator &p_op) const; bool _get_function_signature(DataType &p_base_type, const StringName &p_function, DataType &r_return_type, List<DataType> &r_arg_types, int &r_default_arg_count, bool &r_static, bool &r_vararg) const; bool _get_member_type(const DataType &p_base_type, const StringName &p_member, DataType &r_member_type) const; - bool _is_type_compatible(const DataType &p_container, const DataType &p_expression) const; + bool _is_type_compatible(const DataType &p_container, const DataType &p_expression, bool p_allow_implicit_conversion = false) const; DataType _reduce_node_type(Node *p_node); DataType _reduce_function_call_type(const OperatorNode *p_call); |