History

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

Zach Fox committed 9 years ago

Commit 91333cd2 parents 3e13928 815f68079 files · +784 −892Browse files

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

Unified · Split

interface/src/Application.cpp+1−0
@@ -5091,6 +5091,7 @@ void Application::update(float deltaTime) { · 5090 unmodified lines
5091 }5091 }
5092 5092
5093 this->updateCamera(appRenderArgs._renderArgs);5093 this->updateCamera(appRenderArgs._renderArgs);
5094 appRenderArgs._eyeToWorld = _myCamera.getTransform();
5094 appRenderArgs._isStereo = false;5095 appRenderArgs._isStereo = false;
5095 5096
5096 {5097 {