diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-03 06:49:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-03 06:49:21 +0400 |
| commit | 8e232af37c34740928b6be3b08a236310a78fa6f (patch) | |
| tree | 670e644c241b2be846ebb4b3a50b184e68ff7a28 /source/gameengine/Physics | |
| parent | ee22fe7bacee9d7089b8a318fb435fe0c449c24f (diff) | |
| parent | 6b4bdf621f2830ceff2c44f871523a312422a338 (diff) | |
svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 3f0c4cb95a1..526176481ed 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -1200,7 +1200,7 @@ PHY_IPhysicsController* CcdPhysicsEnvironment::rayTest(PHY_IRayCastFilterCallbac // Bullet returns the normal from "outside". // If the user requests the real normal, compute it now - if (filterCallback.m_faceNormal) + if (filterCallback.m_faceNormal) { if (shape->isSoftBody()) { |