Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 09:17:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

workaround bug

Browse source
This commit is contained in:
SamGondelman 2018-02-15 17:28:59 -08:00
parent b189433855
commit 2d0b85af72
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/entities/src/MaterialEntityItem.cpp
View file

@ -27,10 +27,6 @@ MaterialEntityItem::MaterialEntityItem(const EntityItemID& entityItemID) : Entit
_type = EntityTypes::Material; _type = EntityTypes::Material;
} }
MaterialEntityItem::~MaterialEntityItem() {
removeMaterial();
}
EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desiredProperties) const { EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialURL, getMaterialURL); COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialURL, getMaterialURL);
@ -329,6 +325,11 @@ void MaterialEntityItem::postParentFixup() {
applyMaterial(); applyMaterial();
} }
void MaterialEntityItem::preDelete() {
EntityItem::preDelete();
removeMaterial();
}
void MaterialEntityItem::update(const quint64& now) { void MaterialEntityItem::update(const quint64& now) {
if (_retryApply) { if (_retryApply) {
applyMaterial(); applyMaterial();

2
libraries/entities/src/MaterialEntityItem.h
View file

@ -21,7 +21,6 @@ public:
static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties); static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
MaterialEntityItem(const EntityItemID& entityItemID); MaterialEntityItem(const EntityItemID& entityItemID);
~MaterialEntityItem();
ALLOW_INSTANTIATION // This class can be instantiated ALLOW_INSTANTIATION // This class can be instantiated
@ -85,6 +84,7 @@ public:
void removeMaterial(); void removeMaterial();
void postParentFixup() override; void postParentFixup() override;
void preDelete() override;
private: private:
// URL for this material. Currently, only JSON format is supported. Set to "userData" to use the user data to live edit a material. // URL for this material. Currently, only JSON format is supported. Set to "userData" to use the user data to live edit a material.