Showing the changes to libraries/render-utils/src/Model.cpp (1 of 1 file). Show all
Unified · Split
| @@ -573,7 +573,7 @@ bool Model::addToScene(const render::ScenePointer& scene, · 572 unmodified lines | |||
| 573 | 573 | ||
| 574 | bool somethingAdded = false; | 574 | bool somethingAdded = false; |
| 575 | if (_collisionGeometry) { | 575 | if (_collisionGeometry) { |
| 576 | if (_collisionRenderItems.empty()) { | 576 | if (_collisionRenderItemsMap.empty()) { |
| 577 | foreach (auto renderItem, _collisionRenderItems) { | 577 | foreach (auto renderItem, _collisionRenderItems) { |
| 578 | auto item = scene->allocateID(); | 578 | auto item = scene->allocateID(); |
| 579 | auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderItem); | 579 | auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderItem); |
| @@ -583,7 +583,7 @@ bool Model::addToScene(const render::ScenePointer& scene, · 3 unmodified lines | |||
| 583 | transaction.resetItem(item, renderPayload); | 583 | transaction.resetItem(item, renderPayload); |
| 584 | _collisionRenderItemsMap.insert(item, renderPayload); | 584 | _collisionRenderItemsMap.insert(item, renderPayload); |
| 585 | } | 585 | } |
| 586 | somethingAdded = !_collisionRenderItems.empty(); | 586 | somethingAdded = !_collisionRenderItemsMap.empty(); |
| 587 | } | 587 | } |
| 588 | } else { | 588 | } else { |
| 589 | if (_modelMeshRenderItemsMap.empty()) { | 589 | if (_modelMeshRenderItemsMap.empty()) { |
| @@ -632,7 +632,7 @@ void Model::removeFromScene(const render::ScenePointer& scene, render::Transacti · 42 unmodified lines | |||
| 632 | transaction.removeItem(item); | 632 | transaction.removeItem(item); |
| 633 | } | 633 | } |
| 634 | _collisionRenderItems.clear(); | 634 | _collisionRenderItems.clear(); |
| 635 | _collisionRenderItems.clear(); | 635 | _collisionRenderItemsMap.clear(); |
| 636 | _addedToScene = false; | 636 | _addedToScene = false; |
| 637 | 637 | ||
| 638 | _renderInfoVertexCount = 0; | 638 | _renderInfoVertexCount = 0; |