diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-05-06 15:34:16 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-05-06 15:34:16 -0400 |
| commit | d679e7f3bacd7bba5493257f0e6c1c2366bf960a (patch) | |
| tree | b351be1516815a9ebd49bf57e86d7f7125537bec /indra/newview/lldrawable.cpp | |
| parent | 47a5c7a41340a18d90a5a8724762ff32f9ac8afd (diff) | |
| parent | 9180a110bd5b0e41f182c32017b5dccd2eb265be (diff) | |
Merge branch 'release/2025.04' into geenz/gltf-mesh-import
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 4921964b35..9d212cfe8b 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -253,7 +253,15 @@ void LLDrawable::cleanupReferences() std::for_each(mFaces.begin(), mFaces.end(), DeletePointer()); mFaces.clear(); - gPipeline.unlinkDrawable(this); + if (gPipeline.mInitialized) + { + gPipeline.unlinkDrawable(this); + } + else if (getSpatialGroup()) + { + // Not supposed to happen? + getSpatialGroup()->getSpatialPartition()->remove(this, getSpatialGroup()); + } removeFromOctree(); |