From 7ea3e8267afaf626256c84a9a3dc61e2954fc6a2 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Thu, 10 Apr 2014 00:18:27 -0300
Subject: -Fixed a few bugs in Viewport -Made a few demos using Viewport to
 show it's true power! -Fixed some start-up error messages.

---
 core/variant.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'core/variant.cpp')

diff --git a/core/variant.cpp b/core/variant.cpp
index e02c9c33a..6b3b25a10 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[]={
-- 
cgit v1.2.3-70-g09d2