diff options
| author | Juan Linietsky | 2017-01-05 09:18:03 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-05 09:18:03 -0300 |
| commit | 495d059a744b268b0355d0cbfbb9ef30fec865e2 (patch) | |
| tree | 96c7cc2c4bcf3a1f2c62a18ddbe2aaa7a42a44ed /scene/resources/default_theme/default_theme.cpp | |
| parent | 0f7af4ea51744cda23c4d3c7481f9c332973d1d4 (diff) | |
| parent | e39a6242ac1c503a3c35f40c8a44296fa9df28cb (diff) | |
| download | godot-495d059a744b268b0355d0cbfbb9ef30fec865e2.tar.gz godot-495d059a744b268b0355d0cbfbb9ef30fec865e2.tar.zst godot-495d059a744b268b0355d0cbfbb9ef30fec865e2.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
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); |