Changed build OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to ON and then fixed all the resulting build errors.
This commit is contained in:
@@ -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 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user