diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 13:48:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-02 13:48:03 +0100 |
| commit | 0cf34cb3af710b6891d25263b03e4c7eb437af61 (patch) | |
| tree | c67f500d4197e35d6f70c6b3ef73f604ac14bf3b /scene | |
| parent | 17bb7e1c7ea6fecabc0ef2dc454bbde0d60c5290 (diff) | |
| parent | 0bf5d86546cd4829655befd1896eac31175d925e (diff) | |
Merge pull request #7372 from chanon/master
Fix ColorPicker not correctly updating after pasting hex html color
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/color_picker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 4f195c7488..a65c85d24c 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -162,7 +162,7 @@ void ColorPicker::_html_entered(const String& p_html) { if (!is_inside_tree()) return; - _update_color(); + set_color(color); emit_signal("color_changed",color); } |