From e4cb46880442d031c331bcfd8e66ae9c95a669c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= <jaakko.keranen@iki.fi>
Date: Fri, 14 Mar 2014 17:26:17 +0200
Subject: [PATCH] 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.
---
 doomsday/tests/test_glsandbox/test_glsandbox.pro | 5 +++--
 doomsday/tests/test_glsandbox/testwindow.cpp     | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doomsday/tests/test_glsandbox/test_glsandbox.pro b/doomsday/tests/test_glsandbox/test_glsandbox.pro
index bfcb24eef7..6bd34f8fcf 100644
--- a/doomsday/tests/test_glsandbox/test_glsandbox.pro
+++ b/doomsday/tests/test_glsandbox/test_glsandbox.pro
@@ -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
diff --git a/doomsday/tests/test_glsandbox/testwindow.cpp b/doomsday/tests/test_glsandbox/testwindow.cpp
index 3946e94a00..ddd8e5ee59 100644
--- a/doomsday/tests/test_glsandbox/testwindow.cpp
+++ b/doomsday/tests/test_glsandbox/testwindow.cpp
@@ -112,6 +112,11 @@ DENG2_OBSERVES(Bank, Load)
         uModelTex = *modelAtlas;
     }
 
+    ~Instance()
+    {
+        model.glDeinit();
+    }
+
     void canvasGLInit(Canvas &cv)
     {
         try