From c10f298dc6ae2d12dd0d275327c5330c06a2d932 Mon Sep 17 00:00:00 2001
From: OpenSceneGraph git repository <openscenegraph.mirror@gmail.com>
Date: Tue, 24 Apr 2018 15:37:44 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"When=20GL3=20build=20is=20enabled,=20?=
 =?UTF-8?q?default=20context=20requested=20is=20version=203.3,=20=E2=80=A6?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/osg/DisplaySettings.cpp | 4 ----
 src/osg/GraphicsContext.cpp | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
index aceaf4e70..1fd685b33 100644
--- a/src/osg/DisplaySettings.cpp
+++ b/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;
 
diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp
index 40fda7d08..e73ec3e6a 100644
--- a/src/osg/GraphicsContext.cpp
+++ b/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),