TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge de709a5022 into 8407fa360c

Browse source
This commit is contained in:
Brian Roberts 2026-04-22 15:41:49 -06:00 • committed by GitHub
commit ae09a48aaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/camera.cpp
View file

@ -1603,7 +1603,7 @@ F32 Camera::getDamageFlash() const
{ {
const GameBase *castObj = mOrbitObject; const GameBase *castObj = mOrbitObject;
const ShapeBase* psb = dynamic_cast<const ShapeBase*>(castObj); const ShapeBase* psb = dynamic_cast<const ShapeBase*>(castObj);
if (psb) if (psb && !(dynamic_cast<const Camera*>(psb)))
return psb->getDamageFlash(); return psb->getDamageFlash();
} }

2
Engine/source/afx/afxCamera.cpp
View file

@ -1144,7 +1144,7 @@ F32 afxCamera::getDamageFlash() const
{ {
const GameBase *castObj = mOrbitObject; const GameBase *castObj = mOrbitObject;
const ShapeBase* psb = dynamic_cast<const ShapeBase*>(castObj); const ShapeBase* psb = dynamic_cast<const ShapeBase*>(castObj);
if (psb) if (psb && !(dynamic_cast<const Camera*>(psb) || dynamic_cast<const afxCamera*>(psb)) )
return psb->getDamageFlash(); return psb->getDamageFlash();
} }