FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pulled in OpenFlight/expGeometryRecords.cpp from 3.6 branch

Browse Source
This commit is contained in:
Robert Osfield 2018-07-09 18:00:29 +01:00
parent f94980b1fe
commit 15d9c08273
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgPlugins/OpenFlight/expGeometryRecords.cpp
View File

@ -63,7 +63,12 @@ bool
FltExportVisitor::isTextured( int unit, const osg::Geometry& geom ) const FltExportVisitor::isTextured( int unit, const osg::Geometry& geom ) const
{ {
const osg::StateSet* ss = getCurrentStateSet(); const osg::StateSet* ss = getCurrentStateSet();
#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
bool texOn( ss->getTextureMode( unit, GL_TEXTURE_2D ) & osg::StateAttribute::ON ); bool texOn( ss->getTextureMode( unit, GL_TEXTURE_2D ) & osg::StateAttribute::ON );
#else
// In this mode, osg::Texture::getModeUsage() is undefined, so just detect if a texture is present
bool texOn( ss->getTextureAttribute( unit, osg::StateAttribute::TEXTURE ) != NULL );
#endif
bool hasCoords( geom.getTexCoordArray( unit ) != NULL ); bool hasCoords( geom.getTexCoordArray( unit ) != NULL );
return( texOn && hasCoords ); return( texOn && hasCoords );