one more crack at fixing the blender

libraries/render-utils/src/Model.cpp

@@ -1277,20 +1277,26 @@ void ModelBlender::noteRequiresBlend(ModelPointer model) {
         }
         return;
     }
-    _modelsRequiringBlends.insert(model);
+
+    {
+        Lock lock(_mutex);
+        _modelsRequiringBlends.insert(model);
+    }
 }
 
 void ModelBlender::setBlendedVertices(const QPointer<Model>& model, int blendNumber,
         const QWeakPointer<NetworkGeometry>& geometry, const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals) {
+
     if (!model.isNull()) {
         model->setBlendedVertices(blendNumber, geometry, vertices, normals);
     }
     _pendingBlenders--;
-    while (!_modelsRequiringBlends.empty()) {
+    {
-        auto firstItem = _modelsRequiringBlends.begin();
+        Lock lock(_mutex);
-        if (firstItem != _modelsRequiringBlends.end()) {
+        for (auto i = _modelsRequiringBlends.begin(); i != _modelsRequiringBlends.end();) {
-            _modelsRequiringBlends.erase(firstItem);
+            auto weakPtr = *i;
-            ModelPointer nextModel = firstItem->lock();
+            _modelsRequiringBlends.erase(i++); // remove front of the set
+            ModelPointer nextModel = weakPtr.lock();
             if (nextModel && nextModel->maybeStartBlender()) {
                 _pendingBlenders++;
                 return;

libraries/render-utils/src/Model.h

@@ -402,11 +402,15 @@ public slots:
         const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals);
 
 private:
+    using Mutex = std::mutex;
+    using Lock = std::unique_lock<Mutex>;
+
     ModelBlender();
     virtual ~ModelBlender();
 
     std::set<ModelWeakPointer, std::owner_less<ModelWeakPointer>> _modelsRequiringBlends;
     int _pendingBlenders;
+    Mutex _mutex;
 };