mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 05:58:27 +02:00
Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix
Model: fix for crash when displaying collision mesh
This commit is contained in:
commit
26b9469df5
2 changed files with 8 additions and 3 deletions
|
@ -538,7 +538,7 @@ void Model::setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scen
|
||||||
pendingChanges.resetItem(item, _modelMeshRenderItems[item]);
|
pendingChanges.resetItem(item, _modelMeshRenderItems[item]);
|
||||||
}
|
}
|
||||||
foreach (auto item, _collisionRenderItems.keys()) {
|
foreach (auto item, _collisionRenderItems.keys()) {
|
||||||
pendingChanges.resetItem(item, _modelMeshRenderItems[item]);
|
pendingChanges.resetItem(item, _collisionRenderItems[item]);
|
||||||
}
|
}
|
||||||
scene->enqueuePendingChanges(pendingChanges);
|
scene->enqueuePendingChanges(pendingChanges);
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,13 @@
|
||||||
using namespace render;
|
using namespace render;
|
||||||
|
|
||||||
void PendingChanges::resetItem(ItemID id, const PayloadPointer& payload) {
|
void PendingChanges::resetItem(ItemID id, const PayloadPointer& payload) {
|
||||||
_resetItems.push_back(id);
|
if (payload) {
|
||||||
_resetPayloads.push_back(payload);
|
_resetItems.push_back(id);
|
||||||
|
_resetPayloads.push_back(payload);
|
||||||
|
} else {
|
||||||
|
qDebug() << "WARNING: PendingChanges::resetItem with a null payload!";
|
||||||
|
removeItem(id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PendingChanges::removeItem(ItemID id) {
|
void PendingChanges::removeItem(ItemID id) {
|
||||||
|
|
Loading…
Reference in a new issue