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/intern/bmesh_mesh_conv.c | |
| parent | c1ceab1281ccf061f03f8000bf190a082a5385d8 (diff) | |
| parent | 7bfef29f2f2a1b262d28abdc6e30fcd9c1f1caad (diff) | |
svn merge ^/trunk/blender -r55357:55372
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mesh_conv.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |