-invalidated string -> int automatic conversion, fixes #1788

This commit is contained in:
Juan Linietsky 2015-05-04 11:17:11 -03:00
parent f4caddbc23
commit 6f8bd89931

View file

@ -214,7 +214,7 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) {
static const Type valid[]={ static const Type valid[]={
INT, INT,
REAL, REAL,
STRING, //STRING,
NIL, NIL,
}; };
@ -225,7 +225,7 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) {
static const Type valid[]={ static const Type valid[]={
BOOL, BOOL,
REAL, REAL,
STRING, //STRING,
NIL, NIL,
}; };
@ -237,7 +237,7 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) {
static const Type valid[]={ static const Type valid[]={
BOOL, BOOL,
INT, INT,
STRING, //STRING,
NIL, NIL,
}; };