Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 11:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3345 from ZappoMan/virtualEntities

Browse source 
remove assert in favor of warning
This commit is contained in:
Brad Hefta-Gaub 2014-09-03 17:38:07 -07:00
commit 21c7a7c8a7
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/entities/src/UpdateEntityOperator.cpp
View file

@ -175,7 +175,16 @@ bool UpdateEntityOperator::preRecursion(OctreeElement* element) {
// if we are the existing containing element, then we can just do the update of the entity properties
if (entityTreeElement == _containingElement) {
assert(!_removeOld); // We shouldn't be in a remove old case and also be the new best fit
// TODO: We shouldn't be in a remove old case and also be the new best fit. This indicates that
// we have some kind of a logic error in this operator. But, it can handle it properly by setting
// the new properties for the entity and moving on. Still going to output a warning that if we
// see consistently we will want to address this.
if (_removeOld) {
qDebug() << "UNEXPECTED - UpdateEntityOperator - "
"we thought we needed to removeOld, but the old entity is our best fit.";
_removeOld = false;
}
// set the entity properties and mark our element as changed.
_existingEntity->setProperties(_properties);