merge

dardok · Jan 24, 2017 · f78aaad · f78aaad
2 parents 34b0fff + e34b6b3
commit f78aaad
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/util.h b/util.h
@@ -69,14 +69,14 @@ inline eq::Matrix4f osgToVmml( const osg::Matrix& matrix )
 #endif
 }
 
-inline osg::Vec3d vmmlToOsg( const eq::Vector3d& vector )
+inline osg::Vec3d vmmlToOsg( const eq::Vector3f& vector )
 {
     return osg::Vec3d( vector.x( ), vector.y( ), vector.z( ));
 }
 
-inline eq::Vector3d osgToVmml( const osg::Vec3d& vector )
+inline eq::Vector3f osgToVmml( const osg::Vec3d& vector )
 {
-    return eq::Vector3d( vector.x( ), vector.y( ), vector.z( ));
+    return eq::Vector3f( vector.x( ), vector.y( ), vector.z( ));
 }
 
 inline unsigned int eqButtonToOsg( uint32_t button )