Merge branch 'jmt/waypt' into next

[simgear.git] / simgear / scene / model / SGScaleTransform.cxx

diff --git a/simgear/scene/model/SGScaleTransform.cxx b/simgear/scene/model/SGScaleTransform.cxx
index c677ec78e427ebd0b10be7375068b67ef527f202..ab9d6215742674e8a9dfde02438927d36bd5b620 100644 (file)
--- a/simgear/scene/model/SGScaleTransform.cxx
+++ b/simgear/scene/model/SGScaleTransform.cxx
@@ -107,21 +107,21 @@ bool ScaleTransform_readLocalData(osg::Object& obj, osgDB::Input& fr)
     SGScaleTransform& scale = static_cast<SGScaleTransform&>(obj);
     if (fr[0].matchWord("center")) {
         ++fr;
-        SGVec3d center;
-        if (fr.readSequence(center.osg()))
+        osg::Vec3d center;
+        if (fr.readSequence(center))
             fr += 3;
         else
             return false;
-        scale.setCenter(center);
+        scale.setCenter(toSG(center));
     }
     if (fr[0].matchWord("scaleFactor")) {
         ++fr;
-        SGVec3d scaleFactor;
-        if (fr.readSequence(scaleFactor.osg()))
+        osg::Vec3d scaleFactor;
+        if (fr.readSequence(scaleFactor))
             fr += 3;
         else
             return false;
-        scale.setScaleFactor(scaleFactor);
+        scale.setScaleFactor(toSG(scaleFactor));
     }
     return true;
 }