diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-08 08:22:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-08 08:22:47 +0400 |
| commit | 88e5705a3fe04cf9e83baa4007c06e35d19156ae (patch) | |
| tree | a0df4a5945272bd9b910a9905ce3094f84b8c182 /source/blender/makesdna/DNA_object_types.h | |
| parent | ba88824f3228123dc58c033561719c694d0b45f7 (diff) | |
Code Cleanup: remove unused m_contactProcessingThreshold
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 60de5e18b35..811c33befca 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -190,6 +190,8 @@ typedef struct Object { int dupon, dupoff, dupsta, dupend; + int pad; + /* during realtime */ /* note that inertia is only called inertia for historical reasons @@ -210,7 +212,6 @@ typedef struct Object { float margin; float max_vel; /* clamp the maximum velocity 0.0 is disabled */ float min_vel; /* clamp the minimum velocity 0.0 is disabled */ - float m_contactProcessingThreshold; float obstacleRad; /* "Character" physics properties */ |