diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-04-10 00:18:27 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-04-10 00:18:27 -0300 |
commit | 7ea3e8267afaf626256c84a9a3dc61e2954fc6a2 (patch) | |
tree | 0aa7588918b814d1781fc94e8b518c7095a0bab7 /core/variant.cpp | |
parent | b4969373b3475799d6b24cdffeda4659c37f0b8a (diff) | |
download | redot-engine-7ea3e8267afaf626256c84a9a3dc61e2954fc6a2.tar.gz |
-Fixed a few bugs in Viewport
-Made a few demos using Viewport to show it's true power!
-Fixed some start-up error messages.
Diffstat (limited to 'core/variant.cpp')
-rw-r--r-- | core/variant.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index e02c9c33a1..6b3b25a103 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -298,6 +298,19 @@ bool Variant::can_convert(Variant::Type p_type_from,Variant::Type p_type_to) { valid_types=valid; } break; + + case COLOR: { + + static const Type valid[] = { + STRING, + INT, + NIL, + }; + + valid_types = valid; + + } break; + case _RID: { static const Type valid[]={ |