diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 11:07:57 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 11:10:42 -0300 |
| commit | dcb95ec1473eff3f455909cd81c3cd50b1e1159b (patch) | |
| tree | 60343275911d48ebf993041dec92e1eac112b746 /tools/editor/property_editor.cpp | |
| parent | 93ab45b6b5c4f8e0619e963156c983009d399a9d (diff) | |
| download | redot-engine-dcb95ec1473eff3f455909cd81c3cd50b1e1159b.tar.gz | |
removed duplicated functions in class hierarchy that were bound more than once
added a check to detect this case in the future
Diffstat (limited to 'tools/editor/property_editor.cpp')
| -rw-r--r-- | tools/editor/property_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index f602c3ee72..8f294a5102 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -824,7 +824,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty color_picker->show(); color_picker->set_edit_alpha(hint!=PROPERTY_HINT_COLOR_NO_ALPHA); - color_picker->set_color(v); + color_picker->set_pick_color(v); set_size( Size2(300*EDSCALE, color_picker->get_combined_minimum_size().height+10*EDSCALE)); color_picker->set_focus_on_line_edit(); /* |