From 27cf080ad64114fe5af37922e7a305afa492e218 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Mon, 5 Aug 2019 09:51:45 -0700 Subject: [PATCH] Simplify getting nestable pointer in BaseNestableTransformNode::toVariantMap --- libraries/shared/src/NestableTransformNode.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/shared/src/NestableTransformNode.h b/libraries/shared/src/NestableTransformNode.h index 2b3d085664..4d99a787da 100644 --- a/libraries/shared/src/NestableTransformNode.h +++ b/libraries/shared/src/NestableTransformNode.h @@ -49,14 +49,12 @@ public: QVariantMap toVariantMap() const { QVariantMap map; - - if (!_spatiallyNestable.expired()) { - auto nestable = _spatiallyNestable.lock(); - if (nestable) { - map["parentID"] = nestable->getID(); - map["parentJointIndex"] = _jointIndex; - map["baseParentScale"] = vec3toVariant(_baseScale); - } + + auto nestable = _spatiallyNestable.lock(); + if (nestable) { + map["parentID"] = nestable->getID(); + map["parentJointIndex"] = _jointIndex; + map["baseParentScale"] = vec3toVariant(_baseScale); } return map;