mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-05-07 06:16:04 +00:00
Merge de709a5022 into 8407fa360c
This commit is contained in:
commit
ae09a48aaf
2 changed files with 2 additions and 2 deletions
|
|
@ -1603,7 +1603,7 @@ F32 Camera::getDamageFlash() const
|
|||
{
|
||||
const GameBase *castObj = mOrbitObject;
|
||||
const ShapeBase* psb = dynamic_cast<const ShapeBase*>(castObj);
|
||||
if (psb)
|
||||
if (psb && !(dynamic_cast<const Camera*>(psb)))
|
||||
return psb->getDamageFlash();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1144,7 +1144,7 @@ F32 afxCamera::getDamageFlash() const
|
|||
{
|
||||
const GameBase *castObj = mOrbitObject;
|
||||
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();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue