From 3262c9a8bd60d9a7012d6a69c3be14938c8ef683 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 26 Nov 2014 10:27:03 -0800 Subject: [PATCH] don't lookup entity when deleting script --- interface/external/gverb/readme.txt | 2 +- interface/src/entities/EntityTreeRenderer.cpp | 18 +++++------------- interface/src/entities/EntityTreeRenderer.h | 1 - 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/interface/external/gverb/readme.txt b/interface/external/gverb/readme.txt index 1a85659b91..aa2fe8a602 100644 --- a/interface/external/gverb/readme.txt +++ b/interface/external/gverb/readme.txt @@ -1,7 +1,7 @@ Instructions for adding the Gverb library to Interface (This is a required library) -Clément Brisset, October 22nd, 2014 +Clément Brisset, Octobre 22nd, 2014 1. Go to https://github.com/highfidelity/gverb Or download the sources directly via this link: diff --git a/interface/src/entities/EntityTreeRenderer.cpp b/interface/src/entities/EntityTreeRenderer.cpp index 192b42c58b..5aacd36a12 100644 --- a/interface/src/entities/EntityTreeRenderer.cpp +++ b/interface/src/entities/EntityTreeRenderer.cpp @@ -195,22 +195,14 @@ QScriptValue EntityTreeRenderer::loadEntityScript(EntityItem* entity) { return entityScriptObject; // newly constructed } -QScriptValue EntityTreeRenderer::getPreviouslyLoadedEntityScript(const EntityItemID& entityItemID) { - EntityItem* entity = static_cast(_tree)->findEntityByEntityItemID(entityItemID); - return getPreviouslyLoadedEntityScript(entity); -} - - -QScriptValue EntityTreeRenderer::getPreviouslyLoadedEntityScript(EntityItem* entity) { - if (entity) { - EntityItemID entityID = entity->getEntityItemID(); - if (_entityScripts.contains(entityID)) { - EntityScriptDetails details = _entityScripts[entityID]; - return details.scriptObject; // previously loaded - } +QScriptValue EntityTreeRenderer::getPreviouslyLoadedEntityScript(const EntityItemID& entityID) { + if (_entityScripts.contains(entityID)) { + EntityScriptDetails details = _entityScripts[entityID]; + return details.scriptObject; // previously loaded } return QScriptValue(); // no script } + void EntityTreeRenderer::setTree(Octree* newTree) { OctreeRenderer::setTree(newTree); static_cast(_tree)->setFBXService(this); diff --git a/interface/src/entities/EntityTreeRenderer.h b/interface/src/entities/EntityTreeRenderer.h index e5eba79e0d..9f06011d30 100644 --- a/interface/src/entities/EntityTreeRenderer.h +++ b/interface/src/entities/EntityTreeRenderer.h @@ -131,7 +131,6 @@ private: QScriptValue loadEntityScript(EntityItem* entity); QScriptValue loadEntityScript(const EntityItemID& entityItemID); QScriptValue getPreviouslyLoadedEntityScript(const EntityItemID& entityItemID); - QScriptValue getPreviouslyLoadedEntityScript(EntityItem* entity); QString loadScriptContents(const QString& scriptMaybeURLorText); QScriptValueList createMouseEventArgs(const EntityItemID& entityID, QMouseEvent* event, unsigned int deviceID); QScriptValueList createMouseEventArgs(const EntityItemID& entityID, const MouseEvent& mouseEvent);