Merge branch 'master' of https://github.com/worklist/hifi into SvoViewer

This commit is contained in:
ZappoMan 2014-03-01 19:27:53 -08:00
commit 1c92cd996c

View file

@ -2469,7 +2469,7 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom
_viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
}
const float WHITE_TEXT[] = { 0.93, 0.93, 0.93 };
const float WHITE_TEXT[] = { 0.93f, 0.93f, 0.93f };
void Application::displayOverlay() {
PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displayOverlay()");