Merge remote-tracking branch 'upstream/master' into MDI7

2017-08-24 11:26:23 +02:00
parent fbb5dabdd5 b89384d810
commit 107b7be95b
108 changed files with 2569 additions and 415 deletions
--- a/include/osg/GLDefines
+++ b/include/osg/GLDefines
@@ -692,10 +692,6 @@ namespace osg
            #endif
        #endif
    #endif
-
-    #if defined(OSG_GLES1_FEATURES) || defined(OSG_GLES2_FEATURES)|| defined(OSG_GLES3_FEATURES)
-        typedef double GLclampd;
-    #endif
 }

 #endif