diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-21 18:26:27 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-21 18:26:27 +0400 |
| commit | 08ef5adb93827565894d112d4ed9ed19746013ba (patch) | |
| tree | b6f70e0cdc3fdfb571c72013f06383acf3ee6674 /source/blender/blenkernel/intern/rigidbody.c | |
| parent | 636b314677036b9240fd4e7f9454e8a7f59d4d51 (diff) | |
Fixes for recent Wlimit stuff, which makes strict gcc freak out
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index bc0e8f2c728..f3276992381 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -288,18 +288,18 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob) for (i = 0; (i < totface) && (mface) && (mvert); i++, mface++) { /* add first triangle - verts 1,2,3 */ { - MVert *va = (IN_RANGE(mface->v1, 0, totvert)) ? (mvert + mface->v1) : (mvert); - MVert *vb = (IN_RANGE(mface->v2, 0, totvert)) ? (mvert + mface->v2) : (mvert); - MVert *vc = (IN_RANGE(mface->v3, 0, totvert)) ? (mvert + mface->v3) : (mvert); + MVert *va = (mface->v1 < totvert) ? (mvert + mface->v1) : (mvert); + MVert *vb = (mface->v2 < totvert) ? (mvert + mface->v2) : (mvert); + MVert *vc = (mface->v3 < totvert) ? (mvert + mface->v3) : (mvert); RB_trimesh_add_triangle(mdata, va->co, vb->co, vc->co); } /* add second triangle if needed - verts 1,3,4 */ if (mface->v4) { - MVert *va = (IN_RANGE(mface->v1, 0, totvert)) ? (mvert + mface->v1) : (mvert); - MVert *vb = (IN_RANGE(mface->v3, 0, totvert)) ? (mvert + mface->v3) : (mvert); - MVert *vc = (IN_RANGE(mface->v4, 0, totvert)) ? (mvert + mface->v4) : (mvert); + MVert *va = (mface->v1 < totvert) ? (mvert + mface->v1) : (mvert); + MVert *vb = (mface->v3 < totvert) ? (mvert + mface->v3) : (mvert); + MVert *vc = (mface->v4 < totvert) ? (mvert + mface->v4) : (mvert); RB_trimesh_add_triangle(mdata, va->co, vb->co, vc->co); } |