瀏覽代碼

Merge pull request #492 from Azaezel/393B

Fix for issue #393
SilentMike 12 年之前
父節點
當前提交
e97aaec302
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Engine/source/T3D/rigidShape.cpp

+ 2 - 1
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);