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

Fixes a game crash caused by instantiating Camera2D and sending a notification from it before adding it to the tree.

Browse Source
This commit is contained in:
BrunoSXS 2021-10-23 17:30:18 -03:00
parent 0aa6f27061
commit eb2deabffe
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/2d/camera_2d.cpp
View File

@ -232,6 +232,7 @@ void Camera2D::_notification(int p_what) {
} break; } break;
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
ERR_FAIL_COND(!is_inside_tree());
if (custom_viewport && ObjectDB::get_instance(custom_viewport_id)) { if (custom_viewport && ObjectDB::get_instance(custom_viewport_id)) {
viewport = custom_viewport; viewport = custom_viewport;
} else { } else {

1
scene/main/canvas_item.cpp
View File

@ -274,6 +274,7 @@ void CanvasItem::_exit_canvas() {
void CanvasItem::_notification(int p_what) { void CanvasItem::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
ERR_FAIL_COND(!is_inside_tree());
_update_texture_filter_changed(false); _update_texture_filter_changed(false);
_update_texture_repeat_changed(false); _update_texture_repeat_changed(false);