diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 08:07:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 08:07:22 +0400 |
| commit | 050439fd9dcf3b7e79bae1fd409364cb1220e598 (patch) | |
| tree | b59ed06999d7eb987fd0e161a831bf2cfa2eb688 /source/blender/bmesh | |
| parent | 21fd09c028dce833f58cdaa8a1ff45876a5e5a2f (diff) | |
bmesh py api - correct class references in docs and rename mesh conversion funcs to ne less confusing.
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.h | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_mesh_conv.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 7b0a59d2ca1..3b7f5182d2d 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -49,7 +49,7 @@ #include "MEM_guardedalloc.h" /* Mesh -> BMesh */ -void BM_mesh_to_bmesh(BMesh *bm, Mesh *me, int set_key, int act_key_nr) +void BM_mesh_bm_from_me(BMesh *bm, Mesh *me, int set_key, int act_key_nr) { MVert *mvert; BLI_array_declare(verts); @@ -421,7 +421,7 @@ BM_INLINE void bmesh_quick_edgedraw_flag(MEdge *med, BMEdge *e) } } -void BM_mesh_from_bmesh(BMesh *bm, Mesh *me, int dotess) +void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess) { MLoop *mloop; MPoly *mpoly; diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.h b/source/blender/bmesh/intern/bmesh_mesh_conv.h index f1b820767d4..f9c51584081 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.h +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.h @@ -34,7 +34,7 @@ struct Mesh; -void BM_mesh_to_bmesh(BMesh *bm, struct Mesh *me, int set_key, int act_key_nr); -void BM_mesh_from_bmesh(BMesh *bm, struct Mesh *me, int dotess); +void BM_mesh_bm_from_me(BMesh *bm, struct Mesh *me, int set_key, int act_key_nr); +void BM_mesh_bm_to_me(BMesh *bm, struct Mesh *me, int dotess); #endif /* __BMESH_MESH_CONV_H__ */ diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 3e0fc881bfa..651093806b6 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -57,7 +57,7 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) Mesh *me = BMO_slot_ptr_get(op, "mesh"); int set_key = BMO_slot_bool_get(op, "set_shapekey"); - BM_mesh_to_bmesh(bm, me, set_key, ob->shapenr - 1); + BM_mesh_bm_from_me(bm, me, set_key, ob->shapenr - 1); if (me->key && ob->shapenr > me->key->totkey) { ob->shapenr = me->key->totkey - 1; @@ -79,5 +79,5 @@ void bmo_bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) /* Object *ob = BMO_slot_ptr_get(op, "object"); */ int dotess = !BMO_slot_bool_get(op, "notessellation"); - BM_mesh_from_bmesh(bm, me, dotess); + BM_mesh_bm_to_me(bm, me, dotess); } |