From c3e31b69ad809fa4679c14690d7c1d1a12a9bfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 3 Aug 2016 14:09:46 +0200 Subject: [PATCH] SceneGraph: fix compilation of Camera class with double as T. Thanks to @ManuelK89 for the report. Actually I should add proper test cases for both float and double version, but I have other high-priority tasks ATM, so it has to wait until later. --- src/Magnum/SceneGraph/Camera.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/SceneGraph/Camera.hpp b/src/Magnum/SceneGraph/Camera.hpp index a176ada83..5bb197d4c 100644 --- a/src/Magnum/SceneGraph/Camera.hpp +++ b/src/Magnum/SceneGraph/Camera.hpp @@ -49,8 +49,8 @@ template MatrixTypeFor aspectRat Clip on smaller side = scale smaller side up */ return MatrixTypeFor::scaling(Math::Vector::pad( (relativeAspectRatio.x() > relativeAspectRatio.y()) == (aspectRatioPolicy == AspectRatioPolicy::Extend) ? - Vector2(relativeAspectRatio.y()/relativeAspectRatio.x(), T(1)) : - Vector2(T(1), relativeAspectRatio.x()/relativeAspectRatio.y()), T(1))); + Math::Vector2(relativeAspectRatio.y()/relativeAspectRatio.x(), T(1)) : + Math::Vector2(T(1), relativeAspectRatio.x()/relativeAspectRatio.y()), T(1))); } }