[23db3a5ade3] blender2.8: Renamed BKE_nomain_mesh_xxx → BKE_mesh_nomain_xxx

Sybren A. Stüvel noreply at git.blender.org
Wed Jun 6 10:31:19 CEST 2018

Commit: 23db3a5ade3c4201e0f9ef84a8605d87789a18f3
Author: Sybren A. Stüvel
Date:   Wed Jun 6 10:30:24 2018 +0200
Branches: blender2.8

Renamed BKE_nomain_mesh_xxx → BKE_mesh_nomain_xxx

This maintains the `BKE_mesh_` prefix for the mesh-related BKE functions.


M	source/blender/blenkernel/BKE_mesh.h
M	source/blender/blenkernel/intern/mesh_convert.c
M	source/blender/editors/object/object_modifier.c


diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index c2aab862c1b..cb58deb9511 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -178,9 +178,9 @@ struct Mesh *BKE_mesh_create_derived_for_modifier(
         struct ModifierData *md, int build_shapekey_layers);
 /* Copies a nomain-Mesh into an existing Mesh. */
-void BKE_nomain_mesh_to_mesh(struct Mesh *mesh_src, struct Mesh *mesh_dst, struct Object *ob,
+void BKE_mesh_nomain_to_mesh(struct Mesh *mesh_src, struct Mesh *mesh_dst, struct Object *ob,
                              CustomDataMask mask, bool take_ownership);
-void BKE_nomain_mesh_to_meshkey(struct Mesh *mesh_src, struct Mesh *mesh_dst, struct KeyBlock *kb);
+void BKE_mesh_nomain_to_meshkey(struct Mesh *mesh_src, struct Mesh *mesh_dst, struct KeyBlock *kb);
 /* vertex level transformations & checks (no derived mesh) */
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c
index 9773a487b46..acd0cf32b13 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -1264,7 +1264,7 @@ static void shapekey_layers_to_keyblocks(Mesh *mesh_src, Mesh *mesh_dst, int act
 /* This is a Mesh-based copy of DM_to_mesh() */
-void BKE_nomain_mesh_to_mesh(Mesh *mesh_src, Mesh *mesh_dst, Object *ob, CustomDataMask mask, bool take_ownership)
+void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, Mesh *mesh_dst, Object *ob, CustomDataMask mask, bool take_ownership)
 	/* mesh_src might depend on mesh_dst, so we need to do everything with a local copy */
 	/* TODO(Sybren): the above claim came from DM_to_mesh(); check whether it is still true with Mesh */
@@ -1415,7 +1415,7 @@ void BKE_nomain_mesh_to_mesh(Mesh *mesh_src, Mesh *mesh_dst, Object *ob, CustomD
 /* This is a Mesh-based copy of DM_to_meshkey() */
-void BKE_nomain_mesh_to_meshkey(Mesh *mesh_src, Mesh *mesh_dst, KeyBlock *kb)
+void BKE_mesh_nomain_to_meshkey(Mesh *mesh_src, Mesh *mesh_dst, KeyBlock *kb)
 	int a, totvert = mesh_src->totvert;
 	float *fp;
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 1dff0d3e39d..dbe2d21a487 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -573,7 +573,7 @@ static int modifier_apply_shape(ReportList *reports, Depsgraph *depsgraph, Scene
 		kb = BKE_keyblock_add(key, md->name);
-		BKE_nomain_mesh_to_meshkey(mesh_applied, me, kb);
+		BKE_mesh_nomain_to_meshkey(mesh_applied, me, kb);
 		BKE_id_free(NULL, mesh_applied);
@@ -622,7 +622,7 @@ static int modifier_apply_obdata(ReportList *reports, Depsgraph *depsgraph, Scen
 				return 0;
-			BKE_nomain_mesh_to_mesh(mesh_applied, me, ob, CD_MASK_MESH, true);
+			BKE_mesh_nomain_to_mesh(mesh_applied, me, ob, CD_MASK_MESH, true);
 			if (md->type == eModifierType_Multires)

More information about the Bf-blender-cvs mailing list