From 6d38f79dc59ec4f273d766dde0baba0196078c1c Mon Sep 17 00:00:00 2001
From: Mariano Suligoy
Date: Wed, 19 Oct 2016 19:43:49 -0300
Subject: Fix Color Picker

Replace shaders with procedurally generated controls---
 scene/resources/default_theme/default_theme.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'scene/resources/default_theme/default_theme.cpp')

diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 266de77ca..2ddc3e757 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -834,15 +834,9 @@ void fill_default_theme(Ref<Theme>& t, const Ref<Font> & default_font, const Ref
 
 	t->set_icon("screen_picker","ColorPicker", make_icon( icon_color_pick_png ) );
 	t->set_icon("add_preset","ColorPicker", make_icon( icon_add_png ) );
-	t->set_icon("color_area", "ColorPicker", make_icon( color_picker_main_png));
 	t->set_icon("color_hue", "ColorPicker", make_icon( color_picker_hue_png));
 	t->set_icon("color_sample", "ColorPicker", make_icon( color_picker_sample_png));
 
-	t->set_shader("uv_editor", "ColorPicker", make_shader("", uv_editor_shader_code, ""));
-	t->set_shader("w_editor", "ColorPicker", make_shader("", w_editor_shader_code, ""));
-
-
-
 	// TooltipPanel
 
 	Ref<StyleBoxTexture> style_tt = make_stylebox( tooltip_bg_png,4,4,4,4);
-- 
cgit v1.2.3-70-g09d2