From 600d09e533e2c3c27ff9dbdf5c6ee44c31b36c1e Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Mon, 19 Nov 2018 00:53:51 +0530
Subject: [PATCH] relax 'isWearable()' condition to match latest changes in
 'master'

---
 libraries/entities/src/EntityItem.cpp      | 3 +--
 libraries/entities/src/ModelEntityItem.cpp | 6 ------
 libraries/entities/src/ModelEntityItem.h   | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 35c491a331..94d0024fd5 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -3280,6 +3280,5 @@ void EntityItem::prepareForSimulationOwnershipBid(EntityItemProperties& properti
 }
 
 bool EntityItem::isWearable() const {
-    return isVisible() && getParentJointIndex() != INVALID_JOINT_INDEX
-        && (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
+    return isVisible() && (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
 }
\ No newline at end of file
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index caa67ade9a..e68e287ee2 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -519,12 +519,6 @@ QVector<bool> ModelEntityItem::getJointTranslationsSet() const {
     return result;
 }
 
-bool ModelEntityItem::isWearable() const
-{
-    return isVisible() && (getParentJointIndex() != INVALID_JOINT_INDEX || getRelayParentJoints())
-        && (getParentID() == DependencyManager::get<NodeList>()->getSessionUUID() || getParentID() == AVATAR_SELF_ID);
-}
-
 bool ModelEntityItem::hasModel() const { 
     return resultWithReadLock<bool>([&] {
         return !_modelURL.isEmpty();
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 3de1ebdbdc..5ca3e2caa1 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -123,7 +123,6 @@ public:
     QVector<glm::vec3> getJointTranslations() const;
     QVector<bool> getJointTranslationsSet() const;
 
-    virtual bool isWearable() const override;
 private:
     void setAnimationSettings(const QString& value); // only called for old bitstream format
     bool applyNewAnimationProperties(AnimationPropertyGroup newProperties);