Merge branch 'maint' into next

[simgear.git] / simgear / math / SGVec3.hxx

diff --git a/simgear/math/SGVec3.hxx b/simgear/math/SGVec3.hxx
index 7695819915e718e1a518910edb5dafbb85bb6aaa..4ec4145a399f005a05ab88d85d1271f2cb919488 100644 (file)
--- a/simgear/math/SGVec3.hxx
+++ b/simgear/math/SGVec3.hxx
@@ -92,6 +92,9 @@ public:
   /// make sure it has at least 3 elements
   explicit SGVec3(const T* d)
   { data()[0] = d[0]; data()[1] = d[1]; data()[2] = d[2]; }
+  template<typename S>
+  explicit SGVec3(const SGVec3<S>& d)
+  { data()[0] = d[0]; data()[1] = d[1]; data()[2] = d[2]; }
   explicit SGVec3(const osg::Vec3f& d)
   { data()[0] = d[0]; data()[1] = d[1]; data()[2] = d[2]; }
   explicit SGVec3(const osg::Vec3d& d)