From 44e303ad90dd0ea7a99c422434d6fd8d7ec92233 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 16 Mar 2017 15:46:51 +0000
Subject: [PATCH] Added explict call to
 state.applyModelViewAndProjectionUniformsIfRequired() when required for
 better GL3/GlES2 support.

---
 src/osgText/Text.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp
index 25a3d4665..2c614f0e2 100644
--- a/src/osgText/Text.cpp
+++ b/src/osgText/Text.cpp
@@ -1118,6 +1118,9 @@ void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplie
         // ** apply this new modelview matrix
         state.applyModelViewMatrix(modelview);
 
+        // workaround for GL3/GL2
+        if (state.getUseModelViewAndProjectionUniforms()) state.applyModelViewAndProjectionUniformsIfRequired();
+
         // OSG_NOTICE<<"New state.applyModelViewMatrix() "<<modelview<<std::endl;
     }
     else
@@ -1249,7 +1252,9 @@ void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplie
     if (needToApplyMatrix)
     {
         // apply this new modelview matrix
-        state.applyModelViewMatrix(previous_modelview);
+
+        // workaround for GL3/GL2
+        if (state.getUseModelViewAndProjectionUniforms()) state.applyModelViewAndProjectionUniformsIfRequired();
     }
 }