diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-07 21:42:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-07 21:42:46 +0400 |
| commit | 051cf6abf879524aae6eee7c99b77a5bf398f397 (patch) | |
| tree | 7d2ce53dac31020760d9ca0aab9efd77ac44f992 /source/blender/editors/mesh | |
| parent | 3b57b343f9e2cdc588f977526d539fc9216b829f (diff) | |
Style Cleanup:
replace 0/1 with TRUE/FALSE define.
Diffstat (limited to 'source/blender/editors/mesh')
| -rwxr-xr-x | source/blender/editors/mesh/knifetool.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/mesh/mesh_navmesh.c | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index 687270ed20e..95bc1d006dc 100755 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -1788,7 +1788,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) kfe->e = NULL; } - kfe->e = BM_Make_Edge(bm, kfe->v1->v, kfe->v2->v, NULL, 1); + kfe->e = BM_Make_Edge(bm, kfe->v1->v, kfe->v2->v, NULL, TRUE); BMO_SetFlag(bm, kfe->e, BOUNDARY); for (ref=kfe->faces.first; ref; ref=ref->next) { @@ -1899,7 +1899,10 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) if (BM_Face_Exists(bm, verts, 3, &f2)) continue; - f2 = BM_Make_Face_QuadTri(bm, v1, v2, v3, NULL, NULL, 0); + f2 = BM_Make_Face_QuadTri(bm, + v1, v2, v3, NULL, + NULL, FALSE); + BMO_SetFlag(bm, f2, FACE_NEW); l = BM_FACE_FIRST_LOOP(f2); @@ -1939,7 +1942,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) BM_Copy_Attributes(bm, bm, f2, f); BM_ITER(l1, &liter1, bm, BM_LOOPS_OF_FACE, f) { - BM_loop_interp_from_face(bm, l1, f2, 1, 1); + BM_loop_interp_from_face(bm, l1, f2, TRUE, TRUE); } } diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index 5eb1fd234e4..870350e18af 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -382,12 +382,15 @@ static Object* createRepresentation(bContext *C, struct recast_polyMesh *pmesh, for(k= 0; k<3; k++) { if(tri[k]<nv) - face[k]= p[tri[k]]; /* shared vertex */ + face[k] = p[tri[k]]; /* shared vertex */ else - face[k]= uniquevbase+tri[k]-nv; /* unique vertex */ + face[k] = uniquevbase+tri[k]-nv; /* unique vertex */ } - newFace= BM_Make_Face_QuadTri(em->bm, EDBM_get_vert_for_index(em, face[0]), EDBM_get_vert_for_index(em, face[2]), - EDBM_get_vert_for_index(em, face[1]), NULL, NULL, 0); + newFace= BM_Make_Face_QuadTri(em->bm, + EDBM_get_vert_for_index(em, face[0]), + EDBM_get_vert_for_index(em, face[2]), + EDBM_get_vert_for_index(em, face[1]), NULL, + NULL, FALSE); /* set navigation polygon idx to the custom layer */ polygonIdx= (int*)CustomData_bmesh_get(&em->bm->pdata, newFace->head.data, CD_RECAST); |