From 6f8bd899311d459b9e391b4acf72ccfa5cc1d806 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 4 May 2015 11:17:11 -0300 Subject: [PATCH] -invalidated string -> int automatic conversion, fixes #1788 --- core/variant.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/variant.cpp b/core/variant.cpp index 5e2ab962a62..c06afb2984c 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, };