]> git.mxchange.org Git - flightgear.git/commitdiff
Fix for OSG 3.5
authorJames Turner <zakalawe@mac.com>
Tue, 3 Nov 2015 21:28:46 +0000 (15:28 -0600)
committerJames Turner <zakalawe@mac.com>
Fri, 13 Nov 2015 22:13:44 +0000 (22:13 +0000)
src/Main/bootstrap.cxx

index a59fdb47e29c8c255925db199c1921b98542e1b0..f15c9098ad0efe40c99fe5125dc2a0365a50a194 100644 (file)
@@ -219,13 +219,15 @@ int main ( int argc, char **argv )
         // ensure sglog is inited before atexit() is registered, so logging
         // is possible inside fgExitCleanup
         sglog();
-        
+
+
+#if (OPENSCENEGRAPH_MAJOR_VERSION == 3) && (OPENSCENEGRAPH_MINOR_VERSION < 5)
         // similar to above, ensure some static maps inside OSG exist before
         // we register our at-exit handler, otherwise the statics are gone
         // when fg_terminate runs, which causes crashes.
         osg::Texture::getTextureObjectManager(0);
         osg::GLBufferObjectManager::getGLBufferObjectManager(0);
-        
+#endif
         std::set_terminate(fg_terminate);
         atexit(fgExitCleanup);
         if (fgviewer)