rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-06 21:54:15 +01:00
Code Issues Releases Activity

LP-32 fix build failure with older osg versions

Browse Source
This commit is contained in:
Philippe Renon 2016-07-09 16:20:30 +02:00
parent 79764f7392
commit 86a09ab03b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp
View File

@ -404,10 +404,12 @@ private:
camera->releaseGLObjects(gc->getState()); camera->releaseGLObjects(gc->getState());
} }
} }
#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 0)
gc->getState()->releaseGLObjects(); gc->getState()->releaseGLObjects();
osg::deleteAllGLObjects(gc->getState()->getContextID()); osg::deleteAllGLObjects(gc->getState()->getContextID());
osg::flushAllDeletedGLObjects(gc->getState()->getContextID()); osg::flushAllDeletedGLObjects(gc->getState()->getContextID());
osg::discardAllGLObjects(gc->getState()->getContextID()); osg::discardAllGLObjects(gc->getState()->getContextID());
#endif
} }
void createViewer() void createViewer()
@ -502,7 +504,6 @@ private:
// if (traits->displayNum < 0) { // if (traits->displayNum < 0) {
// traits->displayNum = 0; // traits->displayNum = 0;
// } // }
traits->windowingSystemPreference = "QT";
#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 3) #if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 3)
// The MyQt windowing system is registered in osgearth.cpp // The MyQt windowing system is registered in osgearth.cpp