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

Merge pull request #9979 from jherico/crash_fix

Browse source 
Fix crash in render-perf-test
This commit is contained in:
Brad Hefta-Gaub 2017-03-24 08:10:37 -07:00 committed by GitHub
commit aa1883ba85
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -996,7 +996,7 @@ void EntityTreeRenderer::checkAndCallPreload(const EntityItemID& entityID, const
}
bool shouldLoad = entity->shouldPreloadScript() && _entitiesScriptEngine;
QString scriptUrl = entity->getScript();
if ((unloadFirst && shouldLoad) || scriptUrl.isEmpty()) {
if (shouldLoad && (unloadFirst || scriptUrl.isEmpty())) {
_entitiesScriptEngine->unloadEntityScript(entityID);
entity->scriptHasUnloaded();
}