From 5503c7909aa75753feb26f9004f54f7e6dbc588b Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Fri, 6 Apr 2018 15:18:21 -0700
Subject: [PATCH] fix materials not disappearing on deletion in certain cases

---
 libraries/entities/src/MaterialEntityItem.cpp | 9 ++++-----
 libraries/entities/src/MaterialEntityItem.h   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index 8b595bf69d..0f77861ba4 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -27,6 +27,10 @@ MaterialEntityItem::MaterialEntityItem(const EntityItemID& entityItemID) : Entit
     _type = EntityTypes::Material;
 }
 
+MaterialEntityItem::~MaterialEntityItem() {
+    removeMaterial();
+}
+
 EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialURL, getMaterialURL);
@@ -328,11 +332,6 @@ void MaterialEntityItem::postParentFixup() {
     applyMaterial();
 }
 
-void MaterialEntityItem::preDelete() {
-    EntityItem::preDelete();
-    removeMaterial();
-}
-
 void MaterialEntityItem::update(const quint64& now) {
     if (_retryApply) {
         applyMaterial();
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
index f77077a782..e203b707cc 100644
--- a/libraries/entities/src/MaterialEntityItem.h
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -21,6 +21,7 @@ public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
 
     MaterialEntityItem(const EntityItemID& entityItemID);
+    ~MaterialEntityItem();
 
     ALLOW_INSTANTIATION // This class can be instantiated
 
@@ -84,7 +85,6 @@ public:
     void removeMaterial();
 
     void postParentFixup() override;
-    void preDelete() override;
 
 private:
     // URL for this material.  Currently, only JSON format is supported.  Set to "userData" to use the user data to live edit a material.