Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Tests|GLSandbox: Fixed OS X deployment, app shutdown
The model needs to be glDeinit'd (or disconnected from the atlas)
before the atlas is deleted.
  • Loading branch information
skyjake committed Mar 14, 2014
1 parent baa5399 commit e4cb468
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 3 additions & 2 deletions doomsday/tests/test_glsandbox/test_glsandbox.pro
Expand Up @@ -17,14 +17,15 @@ SOURCES += \
deployTest($$TARGET)

gfx.files = testpic.png
models.files = models/*
models.files = $$files(models/*)

macx {
linkBinaryToBundledLibdeng2($${TARGET}.app/Contents/MacOS/$${TARGET})
linkBinaryToBundledLibdengGui($${TARGET}.app/Contents/MacOS/$${TARGET})

gfx.path = Contents/Resources/graphics
QMAKE_BUNDLE_DATA += gfx
models.path = Contents/Resources/models
QMAKE_BUNDLE_DATA += gfx models
}
else {
gfx.path = $$DENG_DATA_DIR/graphics
Expand Down
5 changes: 5 additions & 0 deletions doomsday/tests/test_glsandbox/testwindow.cpp
Expand Up @@ -112,6 +112,11 @@ DENG2_OBSERVES(Bank, Load)
uModelTex = *modelAtlas;
}

~Instance()
{
model.glDeinit();
}

void canvasGLInit(Canvas &cv)
{
try
Expand Down

0 comments on commit e4cb468

Please sign in to comment.