History

Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk

Sam Gateau committed 11 years ago

Commit a28c99b2 parents 373ccd0 dec168614 files · +145 −119Browse files

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

Unified · Split

interface/src/Application.cpp+2−2
@@ -392,7 +392,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 391 unmodified lines
392 // emit checkBackgroundDownloads to cause the GeometryCache to check it's queue for requested background392 // emit checkBackgroundDownloads to cause the GeometryCache to check it's queue for requested background
393 // downloads.393 // downloads.
394 QSharedPointer<GeometryCache> geometryCacheP = DependencyManager::get<GeometryCache>();394 QSharedPointer<GeometryCache> geometryCacheP = DependencyManager::get<GeometryCache>();
395 ResourceCache *geometryCache = geometryCacheP.data();395 ResourceCache* geometryCache = geometryCacheP.data();
396 connect(this, &Application::checkBackgroundDownloads, geometryCache, &ResourceCache::checkAsynchronousGets);396 connect(this, &Application::checkBackgroundDownloads, geometryCache, &ResourceCache::checkAsynchronousGets);
397 397
398 // connect the DataProcessor processDatagrams slot to the QUDPSocket readyRead() signal398 // connect the DataProcessor processDatagrams slot to the QUDPSocket readyRead() signal
@@ -3292,7 +3292,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 2893 unmodified lines
3292 gpu::Batch batch;3292 gpu::Batch batch;
3293 model::Skybox::render(batch, _viewFrustum, *skybox);3293 model::Skybox::render(batch, _viewFrustum, *skybox);
3294 3294
3295 gpu::GLBackend::renderBatch(batch);3295 gpu::GLBackend::renderBatch(batch, true);
3296 glUseProgram(0);3296 glUseProgram(0);
3297 }3297 }
3298 }3298 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t