godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 19:31:35 +00:00
Code Releases Wiki Activity

removed duplicated functions in class hierarchy that were bound more than once

Browse Source 
added a check to detect this case in the future
This commit is contained in:
Juan Linietsky
2017-01-14 11:07:57 -03:00
parent 93ab45b6b5
commit dcb95ec147
46 changed files with 179 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/editor/io_plugins/editor_font_import_plugin.cpp
View File

@@ -439,7 +439,7 @@ class EditorFontImportDialog : public ConfirmationDialog {
test_label->set_text("");
test_label->set_text(test_string->get_text());
test_label->add_color_override("font_color",test_color->get_color());
test_label->add_color_override("font_color",test_color->get_pick_color());
}
void _update() {
@@ -681,7 +681,7 @@ public:
testhb->add_child(test_string);
test_color = memnew( ColorPickerButton );
test_color->set_color(get_color("font_color","Label"));
test_color->set_pick_color(get_color("font_color","Label"));
test_color->set_h_size_flags(SIZE_EXPAND_FILL);
test_color->set_stretch_ratio(1);
test_color->connect("color_changed",this,"_update_text3");