diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
| commit | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (patch) | |
| tree | 2c7496c8c656565d2ac6dc0901e1af66f8565101 /source/blender/bmesh | |
| parent | c1ceab1281ccf061f03f8000bf190a082a5385d8 (diff) | |
| parent | 7bfef29f2f2a1b262d28abdc6e30fcd9c1f1caad (diff) | |
svn merge ^/trunk/blender -r55357:55372
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index b9352a25063..55a22fd3613 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -756,7 +756,7 @@ void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx) BM_ITER_MESH (ed, &iter, bm, BM_EDGES_OF_MESH) { if (vptr_map) { /* printf("Edge v1: %p -> %p\n", ed->v1, BLI_ghash_lookup(vptr_map, (const void *)ed->v1));*/ -/* printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void* )ed->v2));*/ +/* printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void *)ed->v2));*/ ed->v1 = BLI_ghash_lookup(vptr_map, (const void *)ed->v1); ed->v2 = BLI_ghash_lookup(vptr_map, (const void *)ed->v2); } diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index e0c8cb61900..c68bb2cd20c 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -660,7 +660,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, bool do_tessface) me->cd_flag = BM_mesh_cd_flag_from_bmesh(bm); /* this is called again, 'dotess' arg is used there */ - mesh_update_customdata_pointers(me, 0); + BKE_mesh_update_customdata_pointers(me, 0); i = 0; BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { @@ -800,7 +800,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, bool do_tessface) BKE_mesh_tessface_calc(me); } - mesh_update_customdata_pointers(me, do_tessface); + BKE_mesh_update_customdata_pointers(me, do_tessface); { BMEditSelection *selected; diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 4041fc2c755..d235aaaa622 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -1087,7 +1087,7 @@ void BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len) * Small utility functions for fast access * * faster alternative to: - * BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void**)v, 3); + * BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 3); */ void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3]) { @@ -1102,7 +1102,7 @@ void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3]) /** * faster alternative to: - * BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void**)v, 4); + * BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 4); */ void BM_face_as_array_vert_quad(BMFace *f, BMVert *r_verts[4]) { |