mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-02 08:49:20 -05:00
General cleanup
Adapt to changes in Ghoul Make use of TextureManager Jenkins compile fix
This commit is contained in:
@@ -247,7 +247,7 @@ void RenderableModel::initialize() {
|
||||
}
|
||||
|
||||
void RenderableModel::initializeGL() {
|
||||
_programObject = BaseModule::ProgramObjectManager.requestProgramObject(
|
||||
_programObject = BaseModule::ProgramObjectManager.request(
|
||||
ProgramName,
|
||||
[]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
|
||||
return OsEng.renderEngine().buildRenderProgram(
|
||||
@@ -271,7 +271,7 @@ void RenderableModel::deinitializeGL() {
|
||||
}
|
||||
_texture = nullptr;
|
||||
|
||||
BaseModule::ProgramObjectManager.releaseProgramObject(
|
||||
BaseModule::ProgramObjectManager.release(
|
||||
ProgramName,
|
||||
[](ghoul::opengl::ProgramObject* p) {
|
||||
OsEng.renderEngine().removeRenderProgram(p);
|
||||
|
||||
Reference in New Issue
Block a user