diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-27 13:52:25 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-27 13:52:25 -0500 |
| commit | 721f53fde47c2727d99e3ecccdb789a67df36de0 (patch) | |
| tree | 55ec5bfa061a5c27272b831e697b78ed1b756a70 /editor/editor_properties.cpp | |
| parent | b06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (diff) | |
| parent | f128f383e892865379cb8b14e7bcc9858efe2973 (diff) | |
| download | redot-engine-721f53fde47c2727d99e3ecccdb789a67df36de0.tar.gz | |
Merge commit godotengine/godot@f128f383e892865379cb8b14e7bcc9858efe2973
Diffstat (limited to 'editor/editor_properties.cpp')
| -rw-r--r-- | editor/editor_properties.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 9e91c3f3e9..bb309a1e3c 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -54,6 +54,7 @@ #include "scene/3d/fog_volume.h" #include "scene/3d/gpu_particles_3d.h" #include "scene/gui/color_picker.h" +#include "scene/gui/grid_container.h" #include "scene/main/window.h" #include "scene/resources/font.h" #include "scene/resources/mesh.h" @@ -2647,7 +2648,7 @@ EditorPropertyColor::EditorPropertyColor() { add_child(picker); picker->set_flat(true); picker->connect("color_changed", callable_mp(this, &EditorPropertyColor::_color_changed)); - picker->connect("popup_closed", callable_mp(this, &EditorPropertyColor::_popup_closed)); + picker->connect("popup_closed", callable_mp(this, &EditorPropertyColor::_popup_closed), CONNECT_DEFERRED); picker->get_popup()->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(picker->get_picker())); picker->get_popup()->connect("about_to_popup", callable_mp(this, &EditorPropertyColor::_picker_opening)); } |