godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54120 from zaevi/fix_null-ref_crashes

This commit is contained in:
Rémi Verschelde 2021-10-23 19:00:12 +02:00 committed by GitHub
parent e12fe670e6 924c2078da
commit e0f887accd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/2d/collision_polygon_2d.cpp
View File

@ -131,6 +131,7 @@ void CollisionPolygon2D::_notification(int p_what) {
} break; } break;
case NOTIFICATION_DRAW: { case NOTIFICATION_DRAW: {
ERR_FAIL_COND(!is_inside_tree());
if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) { if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
break; break;
} }

2
scene/2d/collision_shape_2d.cpp
View File

@ -88,6 +88,8 @@ void CollisionShape2D::_notification(int p_what) {
} break; } break;
case NOTIFICATION_DRAW: { case NOTIFICATION_DRAW: {
ERR_FAIL_COND(!is_inside_tree());
if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) { if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
break; break;
} }

1
scene/2d/ray_cast_2d.cpp
View File

@ -157,6 +157,7 @@ void RayCast2D::_notification(int p_what) {
} break; } break;
case NOTIFICATION_DRAW: { case NOTIFICATION_DRAW: {
ERR_FAIL_COND(!is_inside_tree());
if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) { if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
break; break;
} }

12
scene/gui/control.cpp
View File

@ -637,7 +637,9 @@ void Control::_notification(int p_notification) {
} }
} else { } else {
//is a regular root control or top_level //is a regular root control or top_level
data.RI = get_viewport()->_gui_add_root_control(this); Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
data.RI = viewport->_gui_add_root_control(this);
} }
data.parent_canvas_item = get_parent_item(); data.parent_canvas_item = get_parent_item();
@ -646,7 +648,9 @@ void Control::_notification(int p_notification) {
data.parent_canvas_item->connect("item_rect_changed", callable_mp(this, &Control::_size_changed)); data.parent_canvas_item->connect("item_rect_changed", callable_mp(this, &Control::_size_changed));
} else { } else {
//connect viewport //connect viewport
get_viewport()->connect("size_changed", callable_mp(this, &Control::_size_changed)); Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
viewport->connect("size_changed", callable_mp(this, &Control::_size_changed));
} }
} break; } break;
case NOTIFICATION_EXIT_CANVAS: { case NOTIFICATION_EXIT_CANVAS: {
@ -655,7 +659,9 @@ void Control::_notification(int p_notification) {
data.parent_canvas_item = nullptr; data.parent_canvas_item = nullptr;
} else if (!is_set_as_top_level()) { } else if (!is_set_as_top_level()) {
//disconnect viewport //disconnect viewport
get_viewport()->disconnect("size_changed", callable_mp(this, &Control::_size_changed)); Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
viewport->disconnect("size_changed", callable_mp(this, &Control::_size_changed));
} }
if (data.RI) { if (data.RI) {