[Bf-blender-cvs] [03dd109a846] blender2.8: Cleanup: consistent BKE_mesh naming

Campbell Barton noreply at git.blender.org
Tue May 8 17:28:56 CEST 2018


Commit: 03dd109a84657ebf778dc3c25776f7a93cccf1ac
Author: Campbell Barton
Date:   Tue May 8 17:28:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB03dd109a84657ebf778dc3c25776f7a93cccf1ac

Cleanup: consistent BKE_mesh naming

===================================================================

M	source/blender/blenkernel/BKE_mesh.h
M	source/blender/blenkernel/intern/mesh.c
M	source/blender/modifiers/intern/MOD_util.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 044767130ee..ecfc986215b 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -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);
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index f24e0ae97fa..0879c3e028d 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -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 */
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index a34725d1c69..8eeb90b86bd 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -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) {



More information about the Bf-blender-cvs mailing list