Changeset 9907

Show
Ignore:
Timestamp:
03/11/09 14:31:17 (4 years ago)
Author:
robert
Message:

From Neil Hughes, changed the handling of opacity maps so that when they are used blending in enabled. Merged from svn/trunk using:

svn merge -r 9905:9906 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/3ds/ReaderWriter3DS.cpp

    • Property svn:mergeinfo set to
      /OpenSceneGraph/trunk/include/osg/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9882
      /OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9906
    r9637 r9907  
    822822    } 
    823823 
    824     if (transparency>0.0f || textureTransparancy) 
     824    if (transparency>0.0f || textureTransparancy || mat->opacity_map.flags!=0) 
    825825    { 
    826826        stateset->setMode(GL_BLEND,osg::StateAttribute::ON);