Merge pull request #7372 from chanon/master

Fix ColorPicker not correctly updating after pasting hex html color

Merge pull request #7372 from chanon/master
0cf34cb3 · Rémi Verschelde · GitHub · 17bb7e1c · 0bf5d865 · 0cf34cb3
Commit 0cf34cb3 authored Jan 02, 2017 by Rémi Verschelde Committed by GitHub Jan 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

color_picker.cpp scene/gui/color_picker.cpp +1 -1

No files found.
--- 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);
 }