From fed7966ddae4c8f3539dbfbfd1af482783fa1d27 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Thu, 3 Oct 2013 14:33:45 -0500 Subject: [PATCH] fix for issue #393 --- Engine/source/T3D/rigidShape.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engine/source/T3D/rigidShape.cpp b/Engine/source/T3D/rigidShape.cpp index abd04937b..5d21d97c8 100644 --- a/Engine/source/T3D/rigidShape.cpp +++ b/Engine/source/T3D/rigidShape.cpp @@ -774,7 +774,8 @@ void RigidShape::processTick(const Move* move) // Update the physics based on the integration rate S32 count = mDataBlock->integration; - updateWorkingCollisionSet(getCollisionMask()); + if (!mDisableMove) + updateWorkingCollisionSet(getCollisionMask()); for (U32 i = 0; i < count; i++) updatePos(TickSec / count);