Show
Ignore:
Timestamp:
05/21/13 19:41:07 (16 hours ago)
Author:
robert
Message:

From Farshid Lashkari, "I'm working on a custom ShaderComposer? and I need access to the full StateSetStack? of the State object within the getOrCreateProgram() method. The problem is that "State::apply(const StateSet?* dstate)" does not add the specified stateset to the stack. I'm not sure if this was intentional, but I've updated the function to push/pop the stateset.

I hope the change seems reasonable. I searched the entire code base for code that accesses the StateSetStack?, and noticed RenderBin? and RenderStage? use it. However, I don't think that code would ever be called from within the State::apply() function, so I'm fairly confident the change should be safe."

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgPlugins/p3d/ReaderWriterP3D.cpp

    r13204 r13205  
    11061106    if (getProperty(cur, "colorSpaceOperation", operation) || getProperty(cur, "colourSpaceOperation", operation)) 
    11071107    { 
    1108         osg::ColorSpaceOperation colorOp = osg::NO_COLOUR_SPACE_OPERATION; 
    1109         if (operation=="NO_COLOUR_SPACE_OPERATION") volumeData.colorSpaceOperation = osg::NO_COLOUR_SPACE_OPERATION; 
     1108        if (operation=="NO_COLOR_SPACE_OPERATION") volumeData.colorSpaceOperation = osg::NO_COLOR_SPACE_OPERATION; 
    11101109        else if (operation=="MODULATE_ALPHA_BY_LUMINANCE") volumeData.colorSpaceOperation = osg::MODULATE_ALPHA_BY_LUMINANCE; 
    1111         else if (operation=="MODULATE_ALPHA_BY_COLOUR") volumeData.colorSpaceOperation = osg::MODULATE_ALPHA_BY_COLOUR; 
     1110        else if (operation=="MODULATE_ALPHA_BY_COLOR") volumeData.colorSpaceOperation = osg::MODULATE_ALPHA_BY_COLOR; 
    11121111        else if (operation=="REPLACE_ALPHA_WITH_LUMINANCE") volumeData.colorSpaceOperation = osg::REPLACE_ALPHA_WITH_LUMINANCE; 
    11131112        else if (operation=="REPLACE_RGB_WITH_LUMINANCE") volumeData.colorSpaceOperation = osg::REPLACE_RGB_WITH_LUMINANCE;