From 4f5a27796ff2fa3228f3b684ba8cc35f6332d3f5 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 5 Feb 2014 20:46:17 -0800 Subject: [PATCH] fix warning --- interface/src/Camera.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp index d3a126c38a..7ec4f90eef 100644 --- a/interface/src/Camera.cpp +++ b/interface/src/Camera.cpp @@ -205,8 +205,8 @@ bool Camera::getFrustumNeedsReshape() const { CameraMode Camera::getInterpolatedMode() const { const float SHIFT_THRESHOLD_INTO_FIRST_PERSON = 0.7f; const float SHIFT_THRESHOLD_OUT_OF_FIRST_PERSON = 0.6f; - if (_mode == CAMERA_MODE_FIRST_PERSON && _linearModeShift < SHIFT_THRESHOLD_INTO_FIRST_PERSON || - _prevMode == CAMERA_MODE_FIRST_PERSON && _linearModeShift < SHIFT_THRESHOLD_OUT_OF_FIRST_PERSON) { + if ((_mode == CAMERA_MODE_FIRST_PERSON && _linearModeShift < SHIFT_THRESHOLD_INTO_FIRST_PERSON) || + (_prevMode == CAMERA_MODE_FIRST_PERSON && _linearModeShift < SHIFT_THRESHOLD_OUT_OF_FIRST_PERSON)) { return _prevMode; } return _mode;