From 3f07144cfaa5641a7b3814f40f65011d770795a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 15 Jul 2015 01:11:41 +0200 Subject: [PATCH] SceneGraph: this constructor should be always there. Probably forgot to revert this when I had Camera2D/3D subclasses for deprecated build (and thus this constructor was only needed in those subclasses). --- src/Magnum/SceneGraph/Camera.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Magnum/SceneGraph/Camera.h b/src/Magnum/SceneGraph/Camera.h index 4e0999e01..7c1af14c0 100644 --- a/src/Magnum/SceneGraph/Camera.h +++ b/src/Magnum/SceneGraph/Camera.h @@ -103,12 +103,9 @@ template class Camera: public AbstractFeature& object); - #ifndef MAGNUM_BUILD_DEPRECATED /* This is here to avoid ambiguity with deleted copy constructor when - passing `*this` from class subclassing both BasicCamera3D and - AbstractObject */ + passing `*this` from class subclassing both Camera and AbstractObject */ template, U>::value>::type> Camera(U& object): Camera{static_cast&>(object)} {} - #endif ~Camera();