Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 05:52:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into windows-fixes

Browse source
This commit is contained in:
Stephen Birarda 2015-03-10 13:05:09 -07:00
commit c660b771db
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
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__