From 8733bb1799febedf74322f02f87014503f64b8ea Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 21 Dec 2007 14:16:40 +0000 Subject: [PATCH] From Mathias Froehlich, "Something to extend the texture subloading blacklist. ... we have problems with that on solaris." --- src/osgText/Font.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/osgText/Font.cpp b/src/osgText/Font.cpp index 3979f6a11..349ff55d1 100644 --- a/src/osgText/Font.cpp +++ b/src/osgText/Font.cpp @@ -691,10 +691,17 @@ void Font::GlyphTexture::apply(osg::State& state) const s_subloadAllGlyphsTogether = true; } + if (s_renderer && strstr((const char*)s_renderer,"Sun")!=0) + { + // we're running on an solaris x server, so need to work around its + // subloading bugs by loading all at once. + s_subloadAllGlyphsTogether = true; + } + const char* str = getenv("OSG_TEXT_INCREMENTAL_SUBLOADING"); if (str) { - s_subloadAllGlyphsTogether = strcmp(str,"OFF")==0 || strcmp(str,"Off")==0 || strcmp(str,"Off")==0; + s_subloadAllGlyphsTogether = strcmp(str,"OFF")==0 || strcmp(str,"Off")==0 || strcmp(str,"off")==0; } }