godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use NULL instead of COND checks when appropriate

Browse Source 
Restricted to scene
This commit is contained in:
Ninni Pipping
2023-06-06 14:59:54 +02:00
parent 9723077f4f
commit dcd2b883eb
43 changed files with 123 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/control.cpp
View File

@@ -3180,7 +3180,7 @@ void Control::_notification(int p_notification) {
} else {
// Is a regular root control or top_level.
Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
ERR_FAIL_NULL(viewport);
data.RI = viewport->_gui_add_root_control(this);
get_parent()->connect(SNAME("child_order_changed"), callable_mp(get_viewport(), &Viewport::gui_set_root_order_dirty), CONNECT_REFERENCE_COUNTED);
@@ -3193,7 +3193,7 @@ void Control::_notification(int p_notification) {
} else {
// Connect viewport.
Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
ERR_FAIL_NULL(viewport);
viewport->connect("size_changed", callable_mp(this, &Control::_size_changed));
}
} break;
@@ -3205,7 +3205,7 @@ void Control::_notification(int p_notification) {
} else {
// Disconnect viewport.
Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
ERR_FAIL_NULL(viewport);
viewport->disconnect("size_changed", callable_mp(this, &Control::_size_changed));
}