Merge pull request #7124 from samcake/red

Fixing the disappearing avatars maybe ?

interface/src/avatar/Avatar.cpp

@@ -322,6 +322,12 @@ void Avatar::removeFromScene(AvatarSharedPointer self, std::shared_ptr<render::S
     }
 }
 
+void Avatar::updateRenderItem(render::PendingChanges& pendingChanges) {
+    if (_renderItemID != render::Item::INVALID_ITEM_ID) {
+        pendingChanges.updateItem<render::Payload<AvatarData>>(_renderItemID, [](render::Payload<AvatarData>& p) {});
+    }
+}
+
 void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
     auto& batch = *renderArgs->_batch;
     PROFILE_RANGE_BATCH(batch, __FUNCTION__);

interface/src/avatar/Avatar.h

@@ -76,6 +76,8 @@ public:
     void removeFromScene(AvatarSharedPointer self, std::shared_ptr<render::Scene> scene,
                                 render::PendingChanges& pendingChanges);
 
+    void updateRenderItem(render::PendingChanges& pendingChanges);
+
     //setters
     void setDisplayingLookatVectors(bool displayingLookatVectors) { getHead()->setRenderLookatVectors(displayingLookatVectors); }
     void setDisplayingLookatTarget(bool displayingLookatTarget) { getHead()->setRenderLookatTarget(displayingLookatTarget); }

interface/src/avatar/AvatarManager.cpp

@@ -128,6 +128,7 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
     PerformanceWarning warn(showWarnings, "Application::updateAvatars()");
 
     PerformanceTimer perfTimer("otherAvatars");
+    render::PendingChanges pendingChanges;
 
     // simulate avatars
     auto hashCopy = getHashCopy();
@@ -148,8 +149,11 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
             avatar->simulate(deltaTime);
             avatar->endUpdate();
             ++avatarIterator;
+
+            avatar->updateRenderItem(pendingChanges);
         }
     }
+    qApp->getMain3DScene()->enqueuePendingChanges(pendingChanges);
 
     // simulate avatar fades
     simulateAvatarFades(deltaTime);