diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-07-20 10:07:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-20 10:07:40 +0300 |
commit | 05ee9d2dd060b2e5ff20aa745c525cf20dc750ab (patch) | |
tree | ab8f9ab12975a3dc4dbe733901408ac007c5f56a /source | |
parent | bf6ac302cd3791d814aea711835540a10546a8d4 (diff) |
Minor edits for consistency
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 0c14cfa95a6..882237d2ffb 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -274,7 +274,7 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob) if (ob->type == OB_MESH) { DerivedMesh *dm = NULL; MVert *mvert; - const MLoopTri *lt = NULL; + const MLoopTri *looptri = NULL; int totvert; int tottri = 0; const MLoop *mloop = NULL; @@ -289,7 +289,7 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob) mvert = dm->getVertArray(dm); totvert = dm->getNumVerts(dm); - lt = dm->getLoopTriArray(dm); + looptri = dm->getLoopTriArray(dm); tottri = dm->getNumLoopTri(dm); mloop = dm->getLoopArray(dm); @@ -309,17 +309,17 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob) /* loop over all faces, adding them as triangles to the collision shape * (so for some faces, more than triangle will get added) */ - if (mvert && lt) { + if (mvert && looptri) { for (i = 0; i < tottri; i++) { /* add first triangle - verts 1,2,3 */ - const MLoopTri *lt = <[i]; - int index[3]; + const MLoopTri *lt = &looptri[i]; + int vtri[3]; - index[0] = (&mloop[lt->tri[0]])->v; - index[1] = (&mloop[lt->tri[1]])->v; - index[2] = (&mloop[lt->tri[2]])->v; + vtri[0] = mloop[lt->tri[0]].v; + vtri[1] = mloop[lt->tri[1]].v; + vtri[2] = mloop[lt->tri[2]].v; - RB_trimesh_add_triangle_indices(mdata, i, UNPACK3(index)); + RB_trimesh_add_triangle_indices(mdata, i, UNPACK3(vtri)); } } @@ -595,7 +595,7 @@ void BKE_rigidbody_calc_center_of_mass(Object *ob, float r_center[3]) if (ob->type == OB_MESH) { DerivedMesh *dm = rigidbody_get_mesh(ob); MVert *mvert; - const MLoopTri *looptri = NULL; + const MLoopTri *looptri; int totvert, tottri = 0; const MLoop* mloop = NULL; |