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/include/osgText/Glyph
+++ b/include/osgText/Glyph
@@ -264,8 +264,6 @@ public:

    void addGlyph(Glyph* glyph,int posX, int posY);

-    virtual void apply(osg::State& state) const;
-
    /** Set whether to use a mutex to ensure ref() and unref() are thread safe.*/
    virtual void setThreadSafeRefUnref(bool threadSafe);