From 5a81dface9a27e4924e2496a27ff4f9b9e05c7d8 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Fri, 13 Jan 2017 12:00:51 -0800
Subject: [PATCH] avoid filling log with bogus warning

---
 libraries/render-utils/src/Model.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index ea27a821b7..211e4c9ed6 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -142,16 +142,19 @@ void Model::setSpatiallyNestableOverride(SpatiallyNestablePointer override) {
 Transform Model::getTransform() const {
     SpatiallyNestablePointer spatiallyNestableOverride = _spatiallyNestableOverride.lock();
     if (spatiallyNestableOverride) {
-        Transform transform = spatiallyNestableOverride->getTransform();
-        transform.setScale(getScale());
-        return transform;
-    } else {
-        Transform transform;
-        transform.setScale(getScale());
-        transform.setTranslation(getTranslation());
-        transform.setRotation(getRotation());
-        return transform;
+        bool success;
+        Transform transform = spatiallyNestableOverride->getTransform(success);
+        if (success) {
+            transform.setScale(getScale());
+            return transform;
+        }
     }
+
+    Transform transform;
+    transform.setScale(getScale());
+    transform.setTranslation(getTranslation());
+    transform.setRotation(getRotation());
+    return transform;
 }
 
 void Model::setScale(const glm::vec3& scale) {