Merge pull request #4405 from birarda/master

manually call delete on GLCanvas in Application dtor
This commit is contained in:
Brad Hefta-Gaub 2015-03-10 13:04:16 -07:00
commit 7b6dfc93d6

View file

@ -602,7 +602,10 @@ Application::~Application() {
_myAvatar = NULL; _myAvatar = NULL;
ModelEntityItem::cleanupLoadedAnimations() ; ModelEntityItem::cleanupLoadedAnimations();
delete _glWidget;
_glWidget = NULL;
DependencyManager::destroy<AnimationCache>(); DependencyManager::destroy<AnimationCache>();
DependencyManager::destroy<TextureCache>(); DependencyManager::destroy<TextureCache>();
@ -614,7 +617,7 @@ Application::~Application() {
} }
void Application::initializeGL() { void Application::initializeGL() {
qDebug( "Created Display Window."); qDebug() << "Created Display Window.";
// initialize glut for shape drawing; Qt apparently initializes it on OS X // initialize glut for shape drawing; Qt apparently initializes it on OS X
#ifndef __APPLE__ #ifndef __APPLE__