From 1a46692a04ad5687d9d57438cf19163d439591e0 Mon Sep 17 00:00:00 2001 From: ccp-intern <180460643+ccp-intern@users.noreply.github.com> Date: Wed, 7 Oct 2026 13:07:14 +0200 Subject: [PATCH 1/2] fix async-picking crash --- trinity/Eve/EveSpaceScene.cpp | 2 ++ trinity/Eve/SpaceObject/EveSpaceObject2.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/trinity/Eve/EveSpaceScene.cpp b/trinity/Eve/EveSpaceScene.cpp index f5211d826..fac51f0fd 100644 --- a/trinity/Eve/EveSpaceScene.cpp +++ b/trinity/Eve/EveSpaceScene.cpp @@ -3260,6 +3260,8 @@ bool EveSpaceScene::Initialize() ( *it )->RegisterWithQuadRenderer( *Tr2QuadRenderer::Instance() ); } + PrepareResources(); + return true; } diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp index 70dcded12..96458cc17 100644 --- a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp +++ b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp @@ -1246,6 +1246,10 @@ void EveSpaceObject2::GetBatchesFromOverlayVector( ITriRenderBatchAccumulator* b return; } + if( !mesh ) + { + return; + } TriGeometryRes* geomRes = mesh->GetGeometryResource(); if( !geomRes || !geomRes->IsGood() ) { From fdc9583a9f5d969f1bce2eb0b12199c20711df37 Mon Sep 17 00:00:00 2001 From: ccp-intern <180460643+ccp-intern@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:37:45 +0200 Subject: [PATCH 2/2] Update EveSpaceScene.cpp --- trinity/Eve/EveSpaceScene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trinity/Eve/EveSpaceScene.cpp b/trinity/Eve/EveSpaceScene.cpp index fac51f0fd..dad66eb2d 100644 --- a/trinity/Eve/EveSpaceScene.cpp +++ b/trinity/Eve/EveSpaceScene.cpp @@ -299,6 +299,8 @@ EveSpaceScene::EveSpaceScene( IRoot* lockobj ) : m_combinedPostProcessAttributes.CreateInstance(); m_instancedMeshManager = std::make_unique(); + + PrepareResources(); } IRoot* EveSpaceScene::GetCameraAttachments() const @@ -3260,8 +3262,6 @@ bool EveSpaceScene::Initialize() ( *it )->RegisterWithQuadRenderer( *Tr2QuadRenderer::Instance() ); } - PrepareResources(); - return true; }