asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added conversion from int, string to color

Browse source 
fixes #1971
This commit is contained in:
Juan Linietsky 2015-05-27 10:56:57 -03:00
parent 70edfcdc8d
commit 57a78ec06b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/variant.cpp
View file

@ -302,8 +302,8 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) {
case COLOR: { case COLOR: {
static const Type valid[] = { static const Type valid[] = {
//STRING, STRING,
//INT, INT,
NIL, NIL,
}; };
@ -1653,6 +1653,10 @@ Variant::operator Color() const {
if (type==COLOR) if (type==COLOR)
return *reinterpret_cast<const Color*>(_data._mem); 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 else
return Color(); return Color();
} }