Cleaned out old code paths

2017-03-09 17:33:38 +00:00
parent 96760970ed
commit 2cad221d80
4 changed files with 2 additions and 77 deletions
--- a/include/osgText/Text
+++ b/include/osgText/Text
@@ -302,9 +302,6 @@ public:
        GlyphQuads();
        GlyphQuads(const GlyphQuads& gq);

-        void initGlyphQuads();
-        void initGPUBufferObjects();
-
        void setupPrimitives(Text::BackdropType backdropType);

        Glyphs& getGlyphs() { return _glyphs; }
--- a/include/osgText/TextBase
+++ b/include/osgText/TextBase
@@ -282,9 +282,7 @@ protected:

    void initArraysAndBuffers();

-#ifdef NEW_APPROACH
    osg::VertexArrayState* createVertexArrayState(osg::RenderInfo& renderInfo) const;
-#endif

    bool computeMatrix(osg::Matrix& matrix, osg::State* state=0) const;