Changeset 9585

Show
Ignore:
Timestamp:
01/29/09 12:03:38 (4 years ago)
Author:
robert
Message:

Fixed warning

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.cpp

    r9451 r9585  
    590590                texEnv->setMode(osg::TexEnv::BLEND); 
    591591                break; 
    592  
     592#if defined(__COIN__) && ((COIN_MAJOR_VERSION==2 && COIN_MINOR_VERSION>=2) || (COIN_MAJOR_VERSION>2)) 
    593593            // SGI's Inventor does not have REPLACE mode, but the Coin 3D library does. 
    594594            // Coin supports REPLACE since 2.2 release, TGS Inventor from 4.0. 
    595595            // Let's convert to the TexEnv anyway. 
    596             case (SoTexture2::Model)GL_REPLACE: // SoTexture2::REPLACE is the same as GL_REPLACE 
     596            case SoTexture2::REPLACE: 
    597597                texEnv->setMode(osg::TexEnv::REPLACE); 
    598598                break; 
     599#endif 
     600            default: 
     601                break; 
     602 
    599603        } 
    600604        stateSet->setTextureAttributeAndModes(0,texEnv.get(),osg::StateAttribute::ON);