archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: consistent BKE_mesh naming

Browse Source
This commit is contained in:
Campbell Barton
2018-05-08 17:28:43 +02:00
parent 00127d03f1
commit 03dd109a84
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_mesh.h
View File

@@ -110,8 +110,8 @@ struct Mesh *BKE_mesh_new_nomain_from_template(
int loops_len, int polys_len);
/* These functions construct a new Mesh, contrary to BKE_mesh_from_nurbs which modifies ob itself. */
struct Mesh *BKE_new_mesh_nomain_from_curve(struct Object *ob);
struct Mesh *BKE_new_mesh_nomain_from_curve_displist(struct Object *ob, struct ListBase *dispbase);
struct Mesh *BKE_mesh_new_nomain_from_curve(struct Object *ob);
struct Mesh *BKE_mesh_new_nomain_from_curve_displist(struct Object *ob, struct ListBase *dispbase);
bool BKE_mesh_ensure_edit_data(struct Mesh *me);
bool BKE_mesh_clear_edit_data(struct Mesh *me);

6
source/blender/blenkernel/intern/mesh.c
View File

@@ -1498,7 +1498,7 @@ int BKE_mesh_nurbs_displist_to_mdata(
return 0;
}
Mesh *BKE_new_mesh_nomain_from_curve_displist(Object *ob, ListBase *dispbase)
Mesh *BKE_mesh_new_nomain_from_curve_displist(Object *ob, ListBase *dispbase)
{
Curve *cu = ob->data;
Mesh *mesh;
@@ -1540,7 +1540,7 @@ Mesh *BKE_new_mesh_nomain_from_curve_displist(Object *ob, ListBase *dispbase)
return mesh;
}
Mesh *BKE_new_mesh_nomain_from_curve(Object *ob)
Mesh *BKE_mesh_new_nomain_from_curve(Object *ob)
{
ListBase disp = {NULL, NULL};
@@ -1548,7 +1548,7 @@ Mesh *BKE_new_mesh_nomain_from_curve(Object *ob)
disp = ob->curve_cache->disp;
}
return BKE_new_mesh_nomain_from_curve_displist(ob, &disp);
return BKE_mesh_new_nomain_from_curve_displist(ob, &disp);
}
/* this may fail replacing ob->data, be sure to check ob->type */

2
source/blender/modifiers/intern/MOD_util.c
View File

@@ -319,7 +319,7 @@ Mesh *get_mesh(Object *ob, struct BMEditMesh *em, Mesh *mesh,
}
else if (ELEM(ob->type, OB_FONT, OB_CURVE, OB_SURF)) {
/* TODO(sybren): get evaluated mesh from depsgraph once that's properly generated for curves. */
mesh = BKE_new_mesh_nomain_from_curve(ob);
mesh = BKE_mesh_new_nomain_from_curve(ob);
}
if (use_normals) {