From 5ae0ae885d20fc11416935bf117855b020ab6ad3 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 1 Jan 2020 01:28:42 -0500 Subject: [PATCH] - amend last commit: do it the other direction, too --- src/rendering/r_videoscale.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rendering/r_videoscale.cpp b/src/rendering/r_videoscale.cpp index ac73212e9ee..e5a933e8e80 100644 --- a/src/rendering/r_videoscale.cpp +++ b/src/rendering/r_videoscale.cpp @@ -168,7 +168,10 @@ bool ViewportLinearScale() vid_scalemode = 0; // always use linear if supersampling int x = screen->GetClientWidth(), y = screen->GetClientHeight(); - if ((ViewportScaledWidth(x,y) > (x / ViewportPixelAspect())) || (ViewportScaledHeight(x,y) > (y * ViewportPixelAspect()))) + float aspectmult = ViewportPixelAspect(); + if (aspectmult > 1.f) + aspectmult = 1.f / aspectmult; + if ((ViewportScaledWidth(x,y) > (x * aspectmult)) || (ViewportScaledHeight(x,y) > (y * aspectmult))) return true; return vid_scale_linear;