diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-05 09:53:37 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-05 09:53:37 -0300 |
| commit | bc3c14a76b988a50e65328a932316c2e630a7ae6 (patch) | |
| tree | bf6ce42c3dfee2707f7b8adff072297603b59a23 /core | |
| parent | 0995a230f627e0c953f7fe299be3c6c7449bd0be (diff) | |
Made type-checking for arguments less trict between bool, int real. Fixes #1816
Diffstat (limited to 'core')
| -rw-r--r-- | core/variant.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index f49b202a5b..d7817ac268 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -463,8 +463,8 @@ bool Variant::can_convert_strict(Variant::Type p_type_from,Variant::Type p_type_ case BOOL: { static const Type valid[]={ - //INT, - //REAL, + INT, + REAL, //STRING, NIL, }; @@ -474,7 +474,7 @@ bool Variant::can_convert_strict(Variant::Type p_type_from,Variant::Type p_type_ case INT: { static const Type valid[]={ - //BOOL, + BOOL, REAL, //STRING, NIL, @@ -486,7 +486,7 @@ bool Variant::can_convert_strict(Variant::Type p_type_from,Variant::Type p_type_ case REAL: { static const Type valid[]={ - //BOOL, + BOOL, INT, //STRING, NIL, |