From 3f7a7fb11ab1bf4877f59e93381a3df8bbf0dc56 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 6 Sep 2018 10:29:01 -0700 Subject: [PATCH] Return early from AvatarTransformNode and similar when getTransform fails --- interface/src/ui/overlays/OverlayTransformNode.cpp | 2 +- .../src/avatars-renderer/AvatarTransformNode.cpp | 2 +- libraries/entities/src/EntityTransformNode.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/overlays/OverlayTransformNode.cpp b/interface/src/ui/overlays/OverlayTransformNode.cpp index 64f5be932c..d0a6618e37 100644 --- a/interface/src/ui/overlays/OverlayTransformNode.cpp +++ b/interface/src/ui/overlays/OverlayTransformNode.cpp @@ -21,7 +21,7 @@ Transform OverlayTransformNode::getTransform() { bool success; Transform jointWorldTransform = overlay->getTransform(_jointIndex, success); if (!success) { - jointWorldTransform = Transform(); + return Transform(); } jointWorldTransform.setScale(overlay->getBounds().getScale()); diff --git a/libraries/avatars-renderer/src/avatars-renderer/AvatarTransformNode.cpp b/libraries/avatars-renderer/src/avatars-renderer/AvatarTransformNode.cpp index 2f198e8917..fc5ba5bc1a 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/AvatarTransformNode.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/AvatarTransformNode.cpp @@ -21,7 +21,7 @@ Transform AvatarTransformNode::getTransform() { bool success; Transform jointWorldTransform = avatar->getTransform(_jointIndex, success); if (!success) { - jointWorldTransform = Transform(); + return Transform(); } jointWorldTransform.setScale(avatar->scaleForChildren()); diff --git a/libraries/entities/src/EntityTransformNode.cpp b/libraries/entities/src/EntityTransformNode.cpp index 42b60759db..5b0a690619 100644 --- a/libraries/entities/src/EntityTransformNode.cpp +++ b/libraries/entities/src/EntityTransformNode.cpp @@ -21,7 +21,7 @@ Transform EntityTransformNode::getTransform() { bool success; Transform jointWorldTransform = entity->getTransform(_jointIndex, success); if (!success) { - jointWorldTransform = Transform(); + return Transform(); } jointWorldTransform.setScale(entity->getScaledDimensions());