From 51683b0b535f5e987c2a786a325c4e3640d99d41 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Mon, 27 Aug 2018 10:16:09 -0700
Subject: [PATCH] Remove storage of parenting information from CollisionRegion

---
 libraries/shared/src/RegisteredMetaTypes.h | 27 +---------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index f1c62a8d16..a7f9b72ed2 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -271,10 +271,7 @@ public:
     CollisionRegion(const CollisionRegion& collisionRegion) :
         modelURL(collisionRegion.modelURL),
         shapeInfo(std::make_shared<ShapeInfo>()),
-        transform(collisionRegion.transform),
-        parentID(collisionRegion.parentID),
-        parentJointIndex(collisionRegion.parentJointIndex),
-        joint(collisionRegion.joint)
+        transform(collisionRegion.transform)
     {
         shapeInfo->setParams(collisionRegion.shapeInfo->getType(), collisionRegion.shapeInfo->getHalfExtents(), collisionRegion.modelURL.toString());
     }
@@ -308,15 +305,6 @@ public:
         if (pickVariant["orientation"].isValid()) {
             transform.setRotation(quatFromVariant(pickVariant["orientation"]));
         }
-        if (pickVariant["parentID"].isValid()) {
-            parentID = pickVariant["parentID"].toString();
-        }
-        if (pickVariant["parentJointIndex"].isValid()) {
-            parentJointIndex = pickVariant["parentJointIndex"].toInt();
-        }
-        if (pickVariant["joint"].isValid()) {
-            joint = pickVariant["joint"].toString();
-        }
     }
 
     QVariantMap toVariantMap() const override {
@@ -332,14 +320,6 @@ public:
         collisionRegion["position"] = vec3toVariant(transform.getTranslation());
         collisionRegion["orientation"] = quatToVariant(transform.getRotation());
 
-        if (!parentID.isNull()) {
-            collisionRegion["parentID"] = parentID;
-        }
-        collisionRegion["parentJointIndex"] = parentJointIndex;
-        if (!joint.isNull()) {
-            collisionRegion["joint"] = joint;
-        }
-
         return collisionRegion;
     }
 
@@ -374,11 +354,6 @@ public:
     // We can't compute the shapeInfo here without loading the model first, so we delegate that responsibility to the owning CollisionPick
     std::shared_ptr<ShapeInfo> shapeInfo = std::make_shared<ShapeInfo>();
     Transform transform;
-
-    // Parenting information
-    QUuid parentID;
-    int parentJointIndex = 0;
-    QString joint; 
 };
 
 namespace std {