Browse Source

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).
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
3f07144cfa
  1. 5
      src/Magnum/SceneGraph/Camera.h

5
src/Magnum/SceneGraph/Camera.h

@ -103,12 +103,9 @@ template<UnsignedInt dimensions, class T> class Camera: public AbstractFeature<d
*/
explicit Camera(AbstractObject<dimensions, T>& 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<class U, class = typename std::enable_if<std::is_base_of<AbstractObject<dimensions, T>, U>::value>::type> Camera(U& object): Camera<dimensions, T>{static_cast<AbstractObject<dimensions, T>&>(object)} {}
#endif
~Camera();

Loading…
Cancel
Save