From abe6260da4209b5e6ecbcda8e31d8ec33fb48f8b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 13 Jul 2006 09:01:24 +0000
Subject: [PATCH] Fixed management of Text's StateSet so that it works
 correctly when the DefaultFont is active.

---
 src/osgText/Text.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp
index c19c83276..28104d222 100644
--- a/src/osgText/Text.cpp
+++ b/src/osgText/Text.cpp
@@ -53,6 +53,7 @@ Text::Text():
     _colorGradientBottomRight(0.0f, 0.0f, 1.0f, 1.0f),
     _colorGradientTopRight(1.0f, 1.0f, 1.0f, 1.0f)    
 {
+    setStateSet(DefaultFont::instance()->getStateSet());
     setUseDisplayList(false);
     setSupportsDisplayList(false);
 }
@@ -89,8 +90,8 @@ void Text::setFont(Font* font)
 {
     if (_font==font) return;
     
-    osg::StateSet* previousFontStateSet = _font.valid() ? _font->getStateSet() : 0;
-    osg::StateSet* newFontStateSet = font ? font->getStateSet() : 0;
+    osg::StateSet* previousFontStateSet = _font.valid() ? _font->getStateSet() : DefaultFont::instance()->getStateSet();
+    osg::StateSet* newFontStateSet = font ? font->getStateSet() : DefaultFont::instance()->getStateSet();
     
     if (getStateSet() == previousFontStateSet)
     {