Explorar el Código

Merge pull request #54167 from brunosxs/fix-game-crash-when-sending-a-notification-from-a-camera-class

Rémi Verschelde hace 3 años
padre
commit
b99792b5d9
Se han modificado 2 ficheros con 2 adiciones y 0 borrados
  1. 1 0
      scene/2d/camera_2d.cpp
  2. 1 0
      scene/main/canvas_item.cpp

+ 1 - 0
scene/2d/camera_2d.cpp

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

+ 1 - 0
scene/main/canvas_item.cpp

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