solved conflict

Jean-Yves Didier
Commit 75a3ad1ae2348598394209072315a392b16a7afd 75a3ad1a 1 parent 8887d366
Showing 1 changed file with 2 additions and 1 deletions
scene/osg/osgviewer.h
--- a/scene/osg/osgviewer.h
View file @75a3ad1
+++ b/scene/osg/osgviewer.h
View file @75a3ad1
@@ -17,7 +17,8 @@ public:
 public slots:
     void setSceneData(osg::Object *object)
     {
-         osg::Node* node = dynamic_cast<osg::Node*>(object);
+ 
+     	    osg::Node* node = dynamic_cast<osg::Node*>(object);
         if (node)
         {
             viewer->setSceneData(node);