From e680260c897281ea6fab61035219ee47c8797fa1 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 3 Sep 2014 17:17:36 -0700 Subject: [PATCH] remove assert in favor of warning --- libraries/entities/src/UpdateEntityOperator.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/entities/src/UpdateEntityOperator.cpp b/libraries/entities/src/UpdateEntityOperator.cpp index 37dfe73add..65a86a80ca 100644 --- a/libraries/entities/src/UpdateEntityOperator.cpp +++ b/libraries/entities/src/UpdateEntityOperator.cpp @@ -183,6 +183,7 @@ bool UpdateEntityOperator::preRecursion(OctreeElement* element) { 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.