From 3c6e9378c39ab0dc5cefa3528c96eef9eaac169a Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Tue, 6 Oct 2015 20:20:37 +0200 Subject: [PATCH] fixes merge issues --- interface/src/Application.cpp | 4 ++-- libraries/octree/src/OctreeHeadlessViewer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 565debfbaf..b25f3aa6a5 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4981,7 +4981,7 @@ mat4 Application::getEyeProjection(int eye) const { mat4 Application::getEyePose(int eye) const { if (isHMDMode()) { return getActiveDisplayPlugin()->getEyePose((Eye)eye); - } + } return mat4(); } @@ -4990,7 +4990,7 @@ mat4 Application::getEyeOffset(int eye) const { if (isHMDMode()) { mat4 identity; return getActiveDisplayPlugin()->getView((Eye)eye, identity); -} + } return mat4(); } diff --git a/libraries/octree/src/OctreeHeadlessViewer.h b/libraries/octree/src/OctreeHeadlessViewer.h index 009fcb5cb2..605db15cd2 100644 --- a/libraries/octree/src/OctreeHeadlessViewer.h +++ b/libraries/octree/src/OctreeHeadlessViewer.h @@ -53,8 +53,8 @@ public slots: void setMaxPacketsPerSecond(int maxPacketsPerSecond) { _maxPacketsPerSecond = maxPacketsPerSecond; } // getters for camera attributes - const glm::vec3 getPosition() const { return _viewFrustum.getPosition(); } - const glm::quat getOrientation() const { return _viewFrustum.getOrientation(); } + const glm::vec3& getPosition() const { return _viewFrustum.getPosition(); } + const glm::quat& getOrientation() const { return _viewFrustum.getOrientation(); } // getters for LOD and PPS float getVoxelSizeScale() const { return _voxelSizeScale; }