Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:28:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix for crash on unloaded model

Browse source
This commit is contained in:
Andrew Meadows 2017-01-18 10:44:54 -08:00
parent 3dd8fd838b
commit 189da81bb1
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/avatar/CauterizedModel.cpp
View file

@ -49,7 +49,8 @@ void CauterizedModel::createCollisionRenderItemSet() {
} }
bool CauterizedModel::updateGeometry() { bool CauterizedModel::updateGeometry() {
bool returnValue = Model::updateGeometry(); bool needsFullUpdate = Model::updateGeometry();
if (needsFullUpdate) {
if (_rig->jointStatesEmpty() && getFBXGeometry().joints.size() > 0) { if (_rig->jointStatesEmpty() && getFBXGeometry().joints.size() > 0) {
const FBXGeometry& fbxGeometry = getFBXGeometry(); const FBXGeometry& fbxGeometry = getFBXGeometry();
foreach (const FBXMesh& mesh, fbxGeometry.meshes) { foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
@ -58,7 +59,8 @@ bool CauterizedModel::updateGeometry() {
_cauterizeMeshStates.append(state); _cauterizeMeshStates.append(state);
} }
} }
return returnValue; }
return needsFullUpdate;
} }
void CauterizedModel::updateClusterMatrices() { void CauterizedModel::updateClusterMatrices() {