Merge branch 'master' of https://github.com/highfidelity/hifi into package_models

Atlante45 committed 11 years ago

Commit bcfd4b52 parents bfbc8ff 356dbbe55 files · +478 −3756Browse files

Showing the changes to interface/src/Application.cpp (1 of 55 files). Show all

Unified · Split

@@ -612,7 +612,8 @@ Application::~Application() { · 611 unmodified lines
612		612
613	// stop the glWidget frame timer so it doesn't call paintGL	613	// stop the glWidget frame timer so it doesn't call paintGL
614	_glWidget->stopFrameTimer();	614	_glWidget->stopFrameTimer();
615		615
		616	DependencyManager::destroy<AvatarManager>();
616	DependencyManager::destroy<AnimationCache>();	617	DependencyManager::destroy<AnimationCache>();
617	DependencyManager::destroy<TextureCache>();	618	DependencyManager::destroy<TextureCache>();
618	DependencyManager::destroy<GeometryCache>();	619	DependencyManager::destroy<GeometryCache>();

Keyboard shortcuts