From: timoore <timoore>
Date: Fri, 21 Nov 2008 14:53:37 +0000 (+0000)
Subject: Use simgear clone function instead of OSG's.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=52c46e65a1a10ab011fb6144811ab66ccf72a08d;p=flightgear.git

Use simgear clone function instead of OSG's.

This should remove a dependency on an unreleased version of OSG (2.7.3).
---

diff --git a/src/Main/CameraGroup.cxx b/src/Main/CameraGroup.cxx
index d08948b14..e41dc05fb 100644
--- a/src/Main/CameraGroup.cxx
+++ b/src/Main/CameraGroup.cxx
@@ -22,6 +22,7 @@
 #include "WindowBuilder.hxx"
 #include "WindowSystemAdapter.hxx"
 #include <simgear/props/props.hxx>
+#include <simgear/structure/OSGUtils.hxx>
 #include <simgear/scene/util/RenderConstants.hxx>
 
 #include <algorithm>
@@ -133,12 +134,12 @@ CameraInfo* CameraGroup::addCamera(unsigned flags, Camera* camera,
 
     Camera* farCamera = 0;
     if ((flags & (GUI | ORTHO)) == 0) {
-        farCamera = osg::clone(camera);
+        farCamera = simgear::clone(camera);
         farCamera->setGraphicsContext(camera->getGraphicsContext());
         // Each camera's viewport is written when the window is
         // resized; if the the viewport isn't copied here, it gets updated
         // twice and ends up with the wrong value.
-        farCamera->setViewport(osg::clone(camera->getViewport()));
+        farCamera->setViewport(simgear::clone(camera->getViewport()));
         _viewer->addSlave(farCamera, view, projection, useMasterSceneData);
         installCullVisitor(farCamera);
         info->farCamera = farCamera;