diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-05-04 11:17:11 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-04 11:17:11 -0300 |
commit | 6f8bd899311d459b9e391b4acf72ccfa5cc1d806 (patch) | |
tree | 2b8f03aab8346e3a5db6e5de958c2465b65e5304 | |
parent | f4caddbc23983a48b14c1801bfb254976546b869 (diff) |
-invalidated string -> int automatic conversion, fixes #1788
-rw-r--r-- | core/variant.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 5e2ab962a6..c06afb2984 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -214,7 +214,7 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) { static const Type valid[]={ INT, REAL, - STRING, + //STRING, NIL, }; @@ -225,7 +225,7 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) { static const Type valid[]={ BOOL, REAL, - STRING, + //STRING, NIL, }; @@ -237,7 +237,7 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) { static const Type valid[]={ BOOL, INT, - STRING, + //STRING, NIL, }; |