diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-28 14:42:08 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-28 14:42:08 +0400 |
| commit | 1ff25a14945b520cd78863f49a9d841ad96f2f9f (patch) | |
| tree | 505fa0b43f2e3164222bcbcc88b530a6f2e079f1 | |
| parent | 15d139291fc1a52d50af36db0ab0d3af8093ea78 (diff) | |
| parent | 32644615988277ce60e0447f08d40ef67971bd88 (diff) | |
Merging r60962 through r60963 from trunk into soc-2011-tomatosoc-2011-tomato
| -rw-r--r-- | source/blender/editors/mesh/mesh_navmesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index dc7b30e324c..433fd176217 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -389,7 +389,7 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, } /* need to rebuild entirely because array size changes */ - BM_mesh_elem_table_init(em, BM_VERT); + BM_mesh_elem_table_init(em->bm, BM_VERT); /* create faces */ for (j = 0; j < trinum; j++) { @@ -404,9 +404,9 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, face[k] = uniquevbase + tri[k] - nv; /* unique vertex */ } newFace = BM_face_create_quad_tri(em->bm, - BM_vert_at_index(em, face[0]), - BM_vert_at_index(em, face[2]), - BM_vert_at_index(em, face[1]), NULL, + BM_vert_at_index(em->bm, face[0]), + BM_vert_at_index(em->bm, face[2]), + BM_vert_at_index(em->bm, face[1]), NULL, NULL, false); /* set navigation polygon idx to the custom layer */ |