From c363ca98873e77738969291cee70b3246f37bd42 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 11 Aug 2016 15:29:09 -0700
Subject: [PATCH] 3d-model overlays can now be children

---
 interface/src/ui/overlays/ModelOverlay.cpp | 9 +++++++++
 interface/src/ui/overlays/ModelOverlay.h   | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 9c203c0129..0a89268f6b 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -178,3 +178,12 @@ bool ModelOverlay::findRayIntersectionExtraInfo(const glm::vec3& origin, const g
 ModelOverlay* ModelOverlay::createClone() const {
     return new ModelOverlay(this);
 }
+
+void ModelOverlay::locationChanged(bool tellPhysics) {
+    Base3DOverlay::locationChanged(tellPhysics);
+
+    if (_model && _model->isActive()) {
+        _model->setRotation(getRotation());
+        _model->setTranslation(getPosition());
+    }
+}
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 091cab44c9..d5f709c2db 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -39,6 +39,8 @@ public:
     virtual bool addToScene(Overlay::Pointer overlay, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) override;
     virtual void removeFromScene(Overlay::Pointer overlay, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) override;
 
+    void locationChanged(bool tellPhysics) override;
+
 private:
 
     ModelPointer _model;