Merge branch 'master' into topic-gles3-ios

2017-03-21 15:33:13 +00:00
parent bd2d9a7fed 5d6322da2b
commit 423e14f92f
7 changed files with 128 additions and 310 deletions
--- a/src/osgText/Font.cpp
+++ b/src/osgText/Font.cpp
@@ -32,8 +32,6 @@
 using namespace osgText;
 using namespace std;

-static osg::ApplicationUsageProxy Font_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_TEXT_INCREMENTAL_SUBLOADING <type>","ON | OFF");
-
 #define FIXED_FUNCTION defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
 #define SHADERS_GL3 (defined(OSG_GL3_AVAILABLE) || defined(OSG_GLES3_AVAILABLE))
 #define SHADERS_GL2 !FIXED_FUNCTION && !SHADERS_GL3