From cc4a22a117303b06f31063419785c96597144620 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 1 Sep 2004 09:10:15 +0000 Subject: [PATCH] Added crude #ifdef COIN_BASIC_H around ::REPLACE usage as this is only available under Coing --- src/osgPlugins/Inventor/ConvertFromInventor.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/osgPlugins/Inventor/ConvertFromInventor.cpp b/src/osgPlugins/Inventor/ConvertFromInventor.cpp index adbdcaf32..873ed819c 100644 --- a/src/osgPlugins/Inventor/ConvertFromInventor.cpp +++ b/src/osgPlugins/Inventor/ConvertFromInventor.cpp @@ -573,9 +573,14 @@ osg::StateSet* ConvertFromInventor::getStateSet(SoCallbackAction* action) case SoTexture2::BLEND: texEnv->setMode(osg::TexEnv::BLEND); break; + +#ifdef COIN_BASIC_H +// crude COIN detection so that REPLACE is only compiled in when using Coin +// as the SGI Inventor does do have REPLACE case SoTexture2::REPLACE: texEnv->setMode(osg::TexEnv::REPLACE); break; +#endif } stateSet->setTextureAttributeAndModes(0,texEnv,osg::StateAttribute::ON); }