diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-18 22:48:29 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-18 22:48:29 +0300 |
| commit | 0038e27fc39a422601bc220d8359ff9d98fd604d (patch) | |
| tree | 75e24e1959184e3dae79d73947bc615090b8b0af /core/variant.cpp | |
| parent | f10eb8ffa1a7f6bee9b5228ea1204fd93844e4cc (diff) | |
| parent | 37af8b413674936518a2ebe180f9e7bfcd5795bb (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'core/variant.cpp')
| -rw-r--r-- | core/variant.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index d7817ac268..034dc2b4fc 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -302,8 +302,8 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) { case COLOR: { static const Type valid[] = { - //STRING, - //INT, + STRING, + INT, NIL, }; @@ -1653,6 +1653,10 @@ Variant::operator Color() const { if (type==COLOR) return *reinterpret_cast<const Color*>(_data._mem); + else if (type==STRING) + return Color::html( operator String() ); + else if (type==INT) + return Color::hex( operator int() ); else return Color(); } |