mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into NewAtmosphere.

Browse Source
This commit is contained in:
Jonathas Costa
2017-11-15 18:12:58 -05:00
parent 67033c4583 41dae755f5
commit 0264a3026c
441 changed files with 13553 additions and 6101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/base/rendering/renderabletrail.cpp
View File

@@ -217,7 +217,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
addProperty(_renderingModes);
}
void RenderableTrail::initialize() {
void RenderableTrail::initializeGL() {
RenderEngine& renderEngine = OsEng.renderEngine();
_programObject = renderEngine.buildRenderProgram(
"EphemerisProgram",
@@ -228,7 +228,7 @@ void RenderableTrail::initialize() {
setRenderBin(Renderable::RenderBin::Overlay);
}
void RenderableTrail::deinitialize() {
void RenderableTrail::deinitializeGL() {
RenderEngine& renderEngine = OsEng.renderEngine();
if (_programObject) {
renderEngine.removeRenderProgram(_programObject);