diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-10-10 09:12:57 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-10-10 09:12:57 +0400 |
| commit | 0749bf7be70e32b8fd4dd09839bce0267dbe9b29 (patch) | |
| tree | d72c85ba6eb4c09cdd4dfb950c81a9d847f4239c /source/gameengine/Physics/Sumo | |
| parent | 41ad6f9d0a5923a5f4607417c607d37a10317ee1 (diff) | |
Fix bug in rigid body constraint buttons drawing, and while we are at it, add 'Collision' button to disable collisions between bodies, linked between constraint.
Diffstat (limited to 'source/gameengine/Physics/Sumo')
| -rw-r--r-- | source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp index 80e4dc4044e..3be5e027345 100644 --- a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp @@ -111,8 +111,8 @@ int SumoPhysicsEnvironment::createConstraint( float pivotX,float pivotY,float pivotZ, float axisX,float axisY,float axisZ, float axis1X,float axis1Y,float axis1Z, - float axis2X,float axis2Y,float axis2Z - + float axis2X,float axis2Y,float axis2Z, + int flag ) { int constraintid = 0; diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h index 100adf969d5..65b07a7a0be 100644 --- a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h +++ b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h @@ -63,7 +63,7 @@ public: float pivotX,float pivotY,float pivotZ, float axisX,float axisY,float axisZ, float axis1X=0,float axis1Y=0,float axis1Z=0, - float axis2X=0,float axis2Y=0,float axis2Z=0 + float axis2X=0,float axis2Y=0,float axis2Z=0,int flag=0 ); |