From bf3c81f20b5c0a0d7d5b044bc56a183b628fce80 Mon Sep 17 00:00:00 2001
From: Alexander Holland <alexander.holland@live.de>
Date: Tue, 10 Jul 2018 15:06:36 +0200
Subject: [PATCH] fix ColorPickerButton.get_popup()

---
 scene/gui/color_picker.cpp | 3 ++-
 scene/gui/color_picker.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index f8c188d33d2..8e232c6f467 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -743,8 +743,9 @@ ColorPicker *ColorPickerButton::get_picker() {
 	return picker;
 }
 
-PopupPanel *ColorPickerButton::get_popup() const {
+PopupPanel *ColorPickerButton::get_popup() {
 
+	_update_picker();
 	return popup;
 }
 
diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h
index c8d8e1aa8a7..0166da71186 100644
--- a/scene/gui/color_picker.h
+++ b/scene/gui/color_picker.h
@@ -144,7 +144,7 @@ public:
 	bool is_editing_alpha() const;
 
 	ColorPicker *get_picker();
-	PopupPanel *get_popup() const;
+	PopupPanel *get_popup();
 
 	ColorPickerButton();
 };