Show
Ignore:
Timestamp:
10/25/09 12:52:01 (4 years ago)
Author:
robert
Message:

Introduced usage of OSG_GLES*_AVAILABLE macros to headers and .cpp's to enable building against OpenGL ES 1.x and 2.x headers

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/StateSet.cpp

    r10671 r10691  
    2222#include <osg/FrontFace> 
    2323#include <osg/PolygonMode> 
     24#include <osg/Material> 
    2425#include <osg/BlendFunc> 
    2526#include <osg/Depth> 
     
    2728#include <osg/Node> 
    2829 
     30#include <osg/TexGen> 
     31#include <osg/Texture1D> 
    2932#include <osg/TextureCubeMap> 
    3033#include <osg/TextureRectangle> 
     
    790793        notify(NOTICE)<<"Error: Setting mode 'GL_COLOR_MATERIAL' via osg::StateSet::setMode(mode,value) ignored.\n"; 
    791794        notify(NOTICE)<<"       The mode 'GL_COLOR_MATERIAL' is set by the osg::Material StateAttribute.\n"; 
    792         notify(NOTICE)<<"       Setting this as a mode fools osg's State tracking."<<std::endl; 
     795        notify(NOTICE)<<"       Setting this mode would confuse osg's State tracking."<<std::endl; 
    793796    } 
    794797    else 
     
    812815        notify(NOTICE)<<"Error: Setting mode 'GL_COLOR_MATERIAL' via osg::StateSet::removeMode(mode) ignored.\n"; 
    813816        notify(NOTICE)<<"       The mode 'GL_COLOR_MATERIAL' is set by the osg::Material StateAttribute.\n"; 
    814         notify(NOTICE)<<"       Setting this as a mode fools osg's State tracking."<<std::endl; 
     817        notify(NOTICE)<<"       Setting this mode would confuse osg's State tracking."<<std::endl; 
    815818    } 
    816819    else