maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #46162 from gongpha/jr-_-avoid-get_tree-when-flying-colorpicker

Browse source 
[3.2] Avoid signal methods in ColorPicker to access the tree when it isn't in the tree
This commit is contained in:
Rémi Verschelde 2021-02-18 13:15:12 +01:00 committed by GitHub
parent 3374f84a2f 5ec1eee6b1
commit 0176cc4fca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/gui/color_picker.cpp
View file

@ -579,6 +579,8 @@ void ColorPicker::_preset_input(const Ref<InputEvent> &p_event) {
}
void ColorPicker::_screen_input(const Ref<InputEvent> &p_event) {
if (!is_inside_tree())
return;
Ref<InputEventMouseButton> bev = p_event;
if (bev.is_valid() && bev->get_button_index() == BUTTON_LEFT && !bev->is_pressed()) {
@ -609,6 +611,9 @@ void ColorPicker::_add_preset_pressed() {
}
void ColorPicker::_screen_pick_pressed() {
if (!is_inside_tree())
return;
Viewport *r = get_tree()->get_root();
if (!screen) {
screen = memnew(Control);