Browse Source

Merge pull request #59724 from timothyqiu/custom-viewport

Rémi Verschelde 3 years ago
parent
commit
8f06d8653c
1 changed files with 4 additions and 0 deletions
  1. 4 0
      scene/2d/camera_2d.cpp

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

@@ -583,6 +583,10 @@ void Camera2D::set_custom_viewport(Node *p_viewport) {
 		remove_from_group(canvas_group_name);
 		remove_from_group(canvas_group_name);
 	}
 	}
 
 
+	if (custom_viewport && !ObjectDB::get_instance(custom_viewport_id)) {
+		viewport = nullptr;
+	}
+
 	custom_viewport = Object::cast_to<Viewport>(p_viewport);
 	custom_viewport = Object::cast_to<Viewport>(p_viewport);
 
 
 	if (custom_viewport) {
 	if (custom_viewport) {