diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-01-22 13:38:37 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-01-22 13:38:37 +0800 |
commit | 3437b6d6f5328c5f067f718ef5ae378d97427f05 (patch) | |
tree | 0a38c03d861357b7a9c339d514d3af70ae332eab /indra/newview/pipeline.cpp | |
parent | a314646f06b1a9f108b184d1074f6039405a522b (diff) | |
parent | 9159922bdf47093ba2330ce38ea69562fbbaedb1 (diff) |
Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into 2024.12-ForeverFPS
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 8740578eac..b31c4faedd 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3855,7 +3855,12 @@ void LLPipeline::renderSelectedFaces(const LLColor4& color) for (auto facep : mSelectedFaces) { - if (!facep || facep->getDrawable()->isDead()) + if (!facep || !facep->getViewerObject()) + { + LLSelectMgr::getInstance()->clearSelections(); + return; + } + if (!facep->getDrawable() || facep->getDrawable()->isDead()) { LL_ERRS() << "Bad face on selection" << LL_ENDL; return; |