Changeset 3217

Show
Ignore:
Timestamp:
08/02/04 16:52:24 (10 years ago)
Author:
robert
Message:

Fixed warnings

Location:
OpenSceneGraph/trunk/src
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgGL2/ProgramObject.cpp

    r3202 r3217  
    233233void ProgramObject::releaseGLObjects(osg::State* state) const 
    234234{ 
    235     const_cast<ProgramObject*>(this)->dirtyShaderObjects(); 
     235     
     236    if (!state) const_cast<ProgramObject*>(this)->dirtyShaderObjects(); 
     237    else 
     238    { 
     239        unsigned int contextID = state->getContextID(); 
     240        const_cast<ProgramObject*>(this)->_shaderObjectList[contextID]->dirtyShaderObject(); 
     241    } 
    236242} 
    237243 
  • OpenSceneGraph/trunk/src/osgPlugins/flt/flt2osg.cpp

    r3059 r3217  
    12851285        char cflags[33]; 
    12861286 
    1287         sprintf( cflags, "%X", pSObject->dwFlags ); 
     1287        sprintf( cflags, "%X", (unsigned int)pSObject->dwFlags ); 
    12881288        desc = desc + cflags; 
    12891289 
  • OpenSceneGraph/trunk/src/osgPlugins/txp/TXPParser.cpp

    r3068 r3217  
    922922            } 
    923923            break; 
     924        default: 
     925            break; 
    924926        } 
    925927