Merge pull request #537 from openscenegraph/revert-536-default-gl3-context

Revert "When GL3 build is enabled, default context requested is version 3.3, …"

src/osg/DisplaySettings.cpp

@@ -240,11 +240,7 @@ void DisplaySettings::setDefaults()
 
     _implicitBufferAttachmentRenderMask = DEFAULT_IMPLICIT_BUFFER_ATTACHMENT;
     _implicitBufferAttachmentResolveMask = DEFAULT_IMPLICIT_BUFFER_ATTACHMENT;
-#ifdef OSG_GL3_FEATURES
-    _glContextVersion = "3.3";
-#else
     _glContextVersion = "1.0";
-#endif
     _glContextFlags = 0;
     _glContextProfileMask = 0;
 

src/osg/GraphicsContext.cpp

@@ -239,11 +239,7 @@ GraphicsContext::Traits::Traits(DisplaySettings* ds):
             swapBarrier(0),
             useMultiThreadedOpenGLEngine(false),
             useCursor(true),
-#ifdef OSG_GL3_FEATURES
-            glContextVersion("3.3"),
-#else
             glContextVersion("1.0"),
-#endif
             glContextFlags(0),
             glContextProfileMask(0),
             sharedContext(0),