From 581880593194ea113bd5b849b76689fd747f60e8 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 23 Jun 2015 17:34:44 -0700
Subject: [PATCH] Fixing some merge issues

---
 interface/src/Application.cpp          | 8 ++------
 interface/src/avatar/SkeletonModel.cpp | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2ab08b3a48..3b4ab674ca 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -99,7 +99,6 @@
 #include <UserActivityLogger.h>
 #include <UUID.h>
 #include <VrMenu.h>
-#include <ui/ApplicationOverlayCompositor.h>
 
 #include "Application.h"
 #include "AudioClient.h"
@@ -2369,13 +2368,11 @@ void Application::cameraMenuChanged() {
     }
 }
 
-#if 0
 void Application::rotationModeChanged() {
     if (!Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
         _myAvatar->setHeadPitch(0);
     }
 }
-#endif
 
 void Application::updateCamera(float deltaTime) {
     PerformanceTimer perfTimer("updateCamera");
@@ -3282,8 +3279,7 @@ namespace render {
     }
 }
 
-
-void Application::displaySide(RenderArgs* renderArgs, const Camera& theCamera, bool selfAvatarOnly, bool billboard) {
+void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool selfAvatarOnly, bool billboard) {
     activeRenderingThread = QThread::currentThread();
     PROFILE_RANGE(__FUNCTION__);
     PerformanceTimer perfTimer("display");
@@ -4747,7 +4743,7 @@ mat4 Application::getEyePose(int eye) const {
 
 mat4 Application::getHeadPose() const {
     if (isHMDMode()) {
-        return OculusManager::getHeadPose();
+        return getActiveDisplayPlugin()->getHeadPose();
     }
     return mat4();
 }
diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp
index 2aa08d36f3..e1046cd33e 100644
--- a/interface/src/avatar/SkeletonModel.cpp
+++ b/interface/src/avatar/SkeletonModel.cpp
@@ -771,6 +771,7 @@ void SkeletonModel::resetShapePositionsToDefaultPose() {
 
 void SkeletonModel::renderBoundingCollisionShapes(float alpha) {
     const int BALL_SUBDIVISIONS = 10;
+#if 0
     if (_shapes.isEmpty()) {
         // the bounding shape has not been propery computed
         // so no need to render it
@@ -801,6 +802,7 @@ void SkeletonModel::renderBoundingCollisionShapes(float alpha) {
     Avatar::renderJointConnectingCone( origin, axis, _boundingShape.getRadius(), _boundingShape.getRadius(), glm::vec4(0.6f, 0.8f, 0.6f, alpha));
 
     glPopMatrix();
+#endif
 }
 
 bool SkeletonModel::hasSkeleton() {