Changed build OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to ON and then fixed all the resulting build errors.

This commit is contained in:
Robert Osfield
2009-06-17 10:39:39 +00:00
parent 7c4225e574
commit ad8f2d8974
17 changed files with 48 additions and 48 deletions

View File

@@ -68,7 +68,7 @@ osg::Shader * VirtualProgram::setShader
shaderCurrent = shaderNew;
}
return shaderCurrent;
return shaderCurrent.release();
}
////////////////////////////////////////////////////////////////////////////////
void VirtualProgram::apply( osg::State & state ) const
@@ -170,7 +170,7 @@ void VirtualProgram::apply( osg::State & state ) const
#endif
}
state.applyAttribute( program );
state.applyAttribute( program.get() );
} else {
Program::apply( state );
}