diff options
| author | Juan Linietsky | 2017-01-04 20:28:28 -0300 |
|---|---|---|
| committer | GitHub | 2017-01-04 20:28:28 -0300 |
| commit | d8e54b1e2620be99a3f1fdc7df11009f5a107eaa (patch) | |
| tree | b3fec61b3c469385537d8c290b4091dd8d40f6ee /scene/resources/default_theme/default_theme.cpp | |
| parent | 9e477babb3bf0ce5179395c2a5155a3f3cd36798 (diff) | |
| parent | 6d38f79dc59ec4f273d766dde0baba0196078c1c (diff) | |
| download | godot-d8e54b1e2620be99a3f1fdc7df11009f5a107eaa.tar.gz godot-d8e54b1e2620be99a3f1fdc7df11009f5a107eaa.tar.zst godot-d8e54b1e2620be99a3f1fdc7df11009f5a107eaa.zip | |
Merge pull request #7431 from MarianoGnu/gles3
Fix Color Picker
Diffstat (limited to 'scene/resources/default_theme/default_theme.cpp')
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 4c6cf1c7c..3c6e65bf4 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -835,15 +835,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); |