From 2389295217e345bf48fbb030bb1267d03fa1f691 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Mon, 21 Mar 2016 13:04:37 -0700 Subject: [PATCH] actually properly remove pending blendshapes --- libraries/render-utils/src/Model.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index d9c79f0722..74c5f55fac 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1295,10 +1295,13 @@ void ModelBlender::setBlendedVertices(const QPointer& model, int blendNum _pendingBlenders--; while (!_modelsRequiringBlends.empty()) { auto fistItem = _modelsRequiringBlends.begin(); - ModelPointer nextModel = fistItem->lock(); - if (nextModel && nextModel->maybeStartBlender()) { - _pendingBlenders++; - return; + if (fistItem != _modelsRequiringBlends.end()) { + _modelsRequiringBlends.erase(fistItem); + ModelPointer nextModel = fistItem->lock(); + if (nextModel && nextModel->maybeStartBlender()) { + _pendingBlenders++; + return; + } } } }