Merge pull request #492 from Azaezel/393B

Fix for issue #393
2026-01-20 04:34:48 +00:00 · 2013-10-21 10:04:59 -07:00 · 2013-10-21 10:04:59 -07:00 · e97aaec302
parent 31e00236de fed7966dda
commit e97aaec302
1 changed files with 2 additions and 1 deletions
--- 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);