From de709a50229dd39c803f8524a32d3aa7a4ba2a43 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 19 Apr 2026 17:45:57 -0500 Subject: [PATCH] fix F32 Camera::getDamageFlash() recursion if for some reason a camera ends up orbiting itself or another camera, make sure we don't look to the camera orbiting the camera orbiting the.... --- Engine/source/T3D/camera.cpp | 2 +- Engine/source/afx/afxCamera.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/T3D/camera.cpp b/Engine/source/T3D/camera.cpp index 3e24085839..d8f118cbe1 100644 --- a/Engine/source/T3D/camera.cpp +++ b/Engine/source/T3D/camera.cpp @@ -1603,7 +1603,7 @@ F32 Camera::getDamageFlash() const { const GameBase *castObj = mOrbitObject; const ShapeBase* psb = dynamic_cast(castObj); - if (psb) + if (psb && !(dynamic_cast(psb))) return psb->getDamageFlash(); } diff --git a/Engine/source/afx/afxCamera.cpp b/Engine/source/afx/afxCamera.cpp index f4f141b5ef..b26aefa4ca 100644 --- a/Engine/source/afx/afxCamera.cpp +++ b/Engine/source/afx/afxCamera.cpp @@ -1144,7 +1144,7 @@ F32 afxCamera::getDamageFlash() const { const GameBase *castObj = mOrbitObject; const ShapeBase* psb = dynamic_cast(castObj); - if (psb) + if (psb && !(dynamic_cast(psb) || dynamic_cast(psb)) ) return psb->getDamageFlash(); }