diff options
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 4b14c2aec4b..da758ea0f0b 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -412,7 +412,7 @@ void unlink_mesh(Mesh *me) } /* do not free mesh itself */ -void free_mesh(Mesh *me, int unlink) +void BKE_mesh_free(Mesh *me, int unlink) { if (unlink) unlink_mesh(me); @@ -488,19 +488,19 @@ Mesh *add_mesh(const char *name) { Mesh *me; - me= alloc_libblock(&G.main->mesh, ID_ME, name); + me= BKE_libblock_alloc(&G.main->mesh, ID_ME, name); me->size[0]= me->size[1]= me->size[2]= 1.0; me->smoothresh= 30; me->texflag= ME_AUTOSPACE; me->flag= ME_TWOSIDED; - me->bb= unit_boundbox(); + me->bb= BKE_boundbox_alloc_unit(); me->drawflag= ME_DRAWEDGES|ME_DRAWFACES|ME_DRAWCREASES; return me; } -Mesh *copy_mesh(Mesh *me) +Mesh *BKE_mesh_copy(Mesh *me) { Mesh *men; MTFace *tface; @@ -508,7 +508,7 @@ Mesh *copy_mesh(Mesh *me) int a, i; const int do_tessface = ((me->totface != 0) && (me->totpoly == 0)); /* only do tessface if we have no polys */ - men= copy_libblock(&me->id); + men= BKE_libblock_copy(&me->id); men->mat= MEM_dupallocN(me->mat); for (a=0; a<men->totcol; a++) { @@ -555,7 +555,7 @@ Mesh *copy_mesh(Mesh *me) men->bb= MEM_dupallocN(men->bb); - men->key= copy_key(me->key); + men->key= BKE_key_copy(me->key); if (men->key) men->key->from= (ID *)men; return men; @@ -611,7 +611,7 @@ static void expand_local_mesh(Mesh *me) } } -void make_local_mesh(Mesh *me) +void BKE_mesh_make_local(Mesh *me) { Main *bmain= G.main; Object *ob; @@ -641,7 +641,7 @@ void make_local_mesh(Mesh *me) expand_local_mesh(me); } else if (is_local && is_lib) { - Mesh *me_new= copy_mesh(me); + Mesh *me_new= BKE_mesh_copy(me); me_new->id.us= 0; @@ -682,7 +682,7 @@ void boundbox_mesh(Mesh *me, float *loc, float *size) size[1]= (max[1]-min[1])/2.0f; size[2]= (max[2]-min[2])/2.0f; - boundbox_set_from_min_max(bb, min, max); + BKE_boundbox_init_from_minmax(bb, min, max); } void tex_space_mesh(Mesh *me) @@ -1518,7 +1518,7 @@ void nurbs_to_mesh(Object *ob) cu->totcol= 0; if (ob->data) { - free_libblock(&bmain->curve, ob->data); + BKE_libblock_free(&bmain->curve, ob->data); } ob->data= me; ob->type= OB_MESH; |