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

Merge pull request #14980 from AndrewMeadows/dont-clear-space

Browse source 
Case 21309: don't corrupt workload system
This commit is contained in:
John Conklin II 2019-02-25 09:52:15 -08:00 committed by GitHub
commit 6af2b25767
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -219,7 +219,6 @@ void EntityTreeRenderer::clearNonLocalEntities() {
std::unordered_map<EntityItemID, EntityRendererPointer> savedEntities; std::unordered_map<EntityItemID, EntityRendererPointer> savedEntities;
// remove all entities from the scene // remove all entities from the scene
_space->clear();
auto scene = _viewState->getMain3DScene(); auto scene = _viewState->getMain3DScene();
if (scene) { if (scene) {
render::Transaction transaction; render::Transaction transaction;
@ -259,8 +258,6 @@ void EntityTreeRenderer::clear() {
resetEntitiesScriptEngine(); resetEntitiesScriptEngine();
} }
// remove all entities from the scene // remove all entities from the scene
_space->clear();
auto scene = _viewState->getMain3DScene(); auto scene = _viewState->getMain3DScene();
if (scene) { if (scene) {
render::Transaction transaction; render::Transaction transaction;
@ -1392,4 +1389,4 @@ bool EntityTreeRenderer::removeMaterialFromAvatar(const QUuid& avatarID, graphic
return _removeMaterialFromAvatarOperator(avatarID, material, parentMaterialName); return _removeMaterialFromAvatarOperator(avatarID, material, parentMaterialName);
} }
return false; return false;
} }