Merge pull request #111384 from harperstoeckle/fix-camera-2d-size

akien-mga · akien-mga · commit accf00c00032 · 2025-11-01T19:05:18.000+01:00
Fix incorrect transform calculation in `Camera2D` when using a custom viewport
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
@@ -738,7 +738,8 @@ Size2 Camera2D::_get_camera_screen_size() const {
 	if (is_part_of_edited_scene()) {
 		return Size2(GLOBAL_GET_CACHED(real_t, "display/window/size/viewport_width"), GLOBAL_GET_CACHED(real_t, "display/window/size/viewport_height"));
 	}
-	return get_viewport_rect().size;
+	ERR_FAIL_NULL_V(viewport, Size2());
+	return viewport->get_visible_rect().size;
 }
 
 void Camera2D::set_drag_horizontal_enabled(bool p_enabled) {

Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,8 @@ Size2 Camera2D::_get_camera_screen_size() const {`
`738`	`738`	`if (is_part_of_edited_scene()) {`
`739`	`739`	`return Size2(GLOBAL_GET_CACHED(real_t, "display/window/size/viewport_width"), GLOBAL_GET_CACHED(real_t, "display/window/size/viewport_height"));`
`740`	`740`	`}`
`741`		`- return get_viewport_rect().size;`
	`741`	`+ ERR_FAIL_NULL_V(viewport, Size2());`
	`742`	`+ return viewport->get_visible_rect().size;`
`742`	`743`	`}`
`743`	`744`
`744`	`745`	`void Camera2D::set_drag_horizontal_enabled(bool p_enabled) {`