From a46cc4e1c369dc33a7fd4c3c8d739ffdf9ae96cd Mon Sep 17 00:00:00 2001
From: Zander Otavka <zotavka@gmail.com>
Date: Fri, 7 Aug 2015 09:30:45 -0700
Subject: [PATCH] Fix issue with offsetRotation being applied twice.

---
 interface/src/ui/overlays/Billboard3DOverlay.cpp | 4 +++-
 interface/src/ui/overlays/OverlayPanel.cpp       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/overlays/Billboard3DOverlay.cpp b/interface/src/ui/overlays/Billboard3DOverlay.cpp
index abb33c29e7..0c28b2d4a8 100644
--- a/interface/src/ui/overlays/Billboard3DOverlay.cpp
+++ b/interface/src/ui/overlays/Billboard3DOverlay.cpp
@@ -42,6 +42,8 @@ void Billboard3DOverlay::applyTransformTo(Transform& transform, bool force) {
     if (force || usecTimestampNow() > _transformExpiry) {
         PanelAttachable::applyTransformTo(transform, true);
         transformLookAtCamera(transform);
-        transform.postRotate(getOffsetRotation());
+        if (isFacingAvatar()) {
+            transform.postRotate(getOffsetRotation());
+        }
     }
 }
diff --git a/interface/src/ui/overlays/OverlayPanel.cpp b/interface/src/ui/overlays/OverlayPanel.cpp
index 5ddfc3129e..4088af1ec9 100644
--- a/interface/src/ui/overlays/OverlayPanel.cpp
+++ b/interface/src/ui/overlays/OverlayPanel.cpp
@@ -174,7 +174,9 @@ void OverlayPanel::applyTransformTo(Transform& transform, bool force) {
             transform.postScale(getOffsetScale());
         }
         transformLookAtCamera(transform);
-        transform.postRotate(getOffsetRotation());
+        if (isFacingAvatar()) {
+            transform.postRotate(getOffsetRotation());
+        }
     }
 }