From 03ffbe8180483b44642fddb692416bb0c8d23fd0 Mon Sep 17 00:00:00 2001 From: Aevyrie Date: Mon, 20 Jun 2022 11:19:58 +0000 Subject: [PATCH] Physical viewport calculation fix (#5055) # Objective - Fixes early return when viewport is not set. This now matches the description of the function. ## Solution - Remove errant try `?`. --- crates/bevy_render/src/camera/camera.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/bevy_render/src/camera/camera.rs b/crates/bevy_render/src/camera/camera.rs index 00db5f8401f73..06f8ebf818f7e 100644 --- a/crates/bevy_render/src/camera/camera.rs +++ b/crates/bevy_render/src/camera/camera.rs @@ -116,7 +116,11 @@ impl Camera { /// the full physical rect of the current [`RenderTarget`]. #[inline] pub fn physical_viewport_rect(&self) -> Option<(UVec2, UVec2)> { - let min = self.viewport.as_ref()?.physical_position; + let min = self + .viewport + .as_ref() + .map(|v| v.physical_position) + .unwrap_or(UVec2::ZERO); let max = min + self.physical_viewport_size()?; Some((min, max)) }