From 2bf68cab53784fc45570a506bd8e8d3740d796a3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 29 Jan 2009 11:03:38 +0000 Subject: [PATCH] Fixed warning --- src/osgPlugins/Inventor/ConvertFromInventor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/Inventor/ConvertFromInventor.cpp b/src/osgPlugins/Inventor/ConvertFromInventor.cpp index b914e859d..c33870235 100644 --- a/src/osgPlugins/Inventor/ConvertFromInventor.cpp +++ b/src/osgPlugins/Inventor/ConvertFromInventor.cpp @@ -589,13 +589,17 @@ ConvertFromInventor::getStateSet(SoCallbackAction* action) case SoTexture2::BLEND: texEnv->setMode(osg::TexEnv::BLEND); break; - +#if defined(__COIN__) && ((COIN_MAJOR_VERSION==2 && COIN_MINOR_VERSION>=2) || (COIN_MAJOR_VERSION>2)) // SGI's Inventor does not have REPLACE mode, but the Coin 3D library does. // Coin supports REPLACE since 2.2 release, TGS Inventor from 4.0. // Let's convert to the TexEnv anyway. - case (SoTexture2::Model)GL_REPLACE: // SoTexture2::REPLACE is the same as GL_REPLACE + case SoTexture2::REPLACE: texEnv->setMode(osg::TexEnv::REPLACE); break; +#endif + default: + break; + } stateSet->setTextureAttributeAndModes(0,texEnv.get(),osg::StateAttribute::ON); }