Various typo cleanups, remove unnecessary code etc, found during recent work and separated to a cleanup change

14 files changed, 84 insertions, 83 deletions

diff --git a/source/blender/blenkernel/intern/editderivedbmesh.c b/source/blender/blenkernel/intern/editderivedbmesh.c
index e470cfb9f5c..0bc105ca501 100644
--- a/source/blender/blenkernel/intern/editderivedbmesh.c
+++ b/source/blender/blenkernel/intern/editderivedbmesh.c
@@ -1613,12 +1613,6 @@ DerivedMesh *getEditDerivedBMesh(BMEditMesh *em, Object *UNUSED(ob),
 	
 	CustomData_from_bmeshpoly(&bmdm->dm.faceData, &em->bm->pdata, &em->bm->ldata, 0);
 	
-	bmdm->dm.numVertData = bm->totvert;
-	bmdm->dm.numEdgeData = bm->totedge;
-	bmdm->dm.numFaceData = em->tottri;
-	bmdm->dm.numLoopData = bm->totloop;
-	bmdm->dm.numPolyData = bm->totface;
-	
 	bmdm->dm.getVertCos = bmDM_getVertCos;
 	bmdm->dm.getMinMax = bmDM_getMinMax;
 
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 16cf18b9a50..456a24a1417 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -736,9 +736,9 @@ void mesh_get_texspace(Mesh *me, float *loc_r, float *rot_r, float *size_r)
 		tex_space_mesh(me);
 	}
 
-	if (loc_r) VECCOPY(loc_r, me->loc);
-	if (rot_r) VECCOPY(rot_r, me->rot);
-	if (size_r) VECCOPY(size_r, me->size);
+	if (loc_r) copy_v3_v3(loc_r, me->loc);
+	if (rot_r) copy_v3_v3(rot_r, me->rot);
+	if (size_r) copy_v3_v3(size_r, me->size);
 }
 
 float *get_mesh_orco_verts(Object *ob)
@@ -1118,7 +1118,7 @@ void mball_to_mesh(ListBase *lb, Mesh *me)
 		nors= dl->nors;
 		verts= dl->verts;
 		while(a--) {
-			VECCOPY(mvert->co, verts);
+			copy_v3_v3(mvert->co, verts);
 			normal_float_to_short_v3(mvert->no, nors);
 			mvert++;
 			nors+= 3;
@@ -1231,7 +1231,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int
 			a= dl->parts*dl->nr;
 			data= dl->verts;
 			while(a--) {
-				VECCOPY(mvert->co, data);
+				copy_v3_v3(mvert->co, data);
 				data+=3;
 				vertcount++;
 				mvert++;
@@ -1254,7 +1254,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int
 				a= dl->parts*dl->nr;
 				data= dl->verts;
 				while(a--) {
-					VECCOPY(mvert->co, data);
+					copy_v3_v3(mvert->co, data);
 					data+=3;
 					vertcount++;
 					mvert++;
@@ -1277,7 +1277,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int
 			a= dl->nr;
 			data= dl->verts;
 			while(a--) {
-				VECCOPY(mvert->co, data);
+				copy_v3_v3(mvert->co, data);
 				data+=3;
 				vertcount++;
 				mvert++;
@@ -1305,7 +1305,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int
 			a= dl->parts*dl->nr;
 			data= dl->verts;
 			while(a--) {
-				VECCOPY(mvert->co, data);
+				copy_v3_v3(mvert->co, data);
 				data+=3;
 				vertcount++;
 				mvert++;
@@ -1767,7 +1767,7 @@ void mesh_calc_normals(MVert *mverts, int numVerts, MLoop *mloop, MPoly *mpolys,
 		mf = mfaces;
 		for (i=0; i<numFaces; i++, mf++, origIndexFace++) {
 			if (*origIndexFace < numPolys) {
-				VECCOPY(fnors[i], pnors[*origIndexFace]);
+				copy_v3_v3(fnors[i], pnors[*origIndexFace]);
 			} else {
 				/*eek, we're not corrusponding to polys*/
 				printf("error in mesh_calc_normals; tesselation face indices are incorrect.  normals may look bad.\n");
@@ -2448,7 +2448,7 @@ static void mesh_calc_ngon_normal(MPoly *mpoly, MLoop *loopstart,
 {
 
 	MVert *v1, *v2, *v3;
-	double u[3],  v[3], w[3];
+	double u[3], v[3], w[3];
 	double n[3] = {0.0, 0.0, 0.0}, l;
 	int i;
 
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index d0e34ab371c..ed7a22b5e0b 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2556,15 +2556,19 @@ void object_handle_update(Scene *scene, Object *ob)
 					BLI_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH);
 					if(em) {
 						makeDerivedMesh(scene, ob, em,  scene->customdata_mask, 0); /* was CD_MASK_BAREMESH */
-					} else
+					}
+					else {
 						makeDerivedMesh(scene, ob, NULL, scene->customdata_mask, 0);
+					}
 
 #else				/* ensure CD_MASK_BAREMESH for now */
 					BMEditMesh *em = (ob == scene->obedit)? ((Mesh*)ob->data)->edit_btmesh : NULL;
 					if(em) {
 						makeDerivedMesh(scene, ob, em,  scene->customdata_mask | CD_MASK_BAREMESH, 0); /* was CD_MASK_BAREMESH */
-					} else
+					}
+					else {
 						makeDerivedMesh(scene, ob, NULL, scene->customdata_mask | CD_MASK_BAREMESH, 0);
+					}
 #endif
 
 				}
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 4d75772862f..2193f09c78e 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -127,8 +127,9 @@ int BM_Dissolve_Disk(BMesh *bm, BMVert *v)
 		f = e->l->f;
 		f2 = e->l->radial_next->f;
 
-		if (f != f2 && !BM_Join_TwoFaces(bm, f, f2, NULL))
+		if (f != f2 && !BM_Join_TwoFaces(bm, f, f2, e)) {
 			return 0;
+		}
 
 		return 1;
 	}
@@ -171,7 +172,7 @@ int BM_Dissolve_Disk(BMesh *bm, BMVert *v)
 
 		if (f != f2) {
 			/*join two remaining faces*/
-			if (!BM_Join_TwoFaces(bm, f, f2, NULL)) {
+			if (!BM_Join_TwoFaces(bm, f, f2, e)) {
 				return 0;
 			}
 		}
diff --git a/source/blender/bmesh/intern/bmesh_newcore.c b/source/blender/bmesh/intern/bmesh_newcore.c
index e54bb01bf8f..b339421118b 100644
--- a/source/blender/bmesh/intern/bmesh_newcore.c
+++ b/source/blender/bmesh/intern/bmesh_newcore.c
@@ -1599,7 +1599,6 @@ static int bmesh_cutvert(BMesh *bm, BMVert *v, BMVert ***vout, int *len)
 		   the edges & faces and assign an index to each connected set */
 		while ((e = BLI_array_pop(stack))) {
 			BLI_ghash_insert(visithash, e, SET_INT_IN_POINTER(maxindex));
-			BM_SetIndex(e, maxindex); /* set_dirty! */ /* BMESH_TODO, check the indexs are is invalid after this function runs */
 
 			BM_ITER(l, &liter, bm, BM_LOOPS_OF_EDGE, e) {
 				nl = (l->v == v) ? l->prev : l->next;
@@ -1611,7 +1610,6 @@ static int bmesh_cutvert(BMesh *bm, BMVert *v, BMVert ***vout, int *len)
 
 		maxindex++;
 	}
-	bm->elem_index_dirty |= BM_EDGE;
 
 	/* Make enough verts to split v for each group */
 	verts = MEM_callocN(sizeof(BMVert *) * maxindex, "bmesh_cutvert");
diff --git a/source/blender/bmesh/intern/in-progress/BME_conversions.c b/source/blender/bmesh/intern/in-progress/BME_conversions.c
index 2637d62d5a1..2ed91c736fc 100644
--- a/source/blender/bmesh/intern/in-progress/BME_conversions.c
+++ b/source/blender/bmesh/intern/in-progress/BME_conversions.c
@@ -334,7 +334,7 @@ BMMesh *derivedmesh_to_bmesh(DerivedMesh *dm)
 
 static void bmeshvert_to_mvert(BMMesh *bm, BMVert *v, MVert *mv, int index, CustomData *data)
 {
-		copy_v3_v3(mv->co,v->co);
+		copy_v3_v3(mv->co, v->co);
 		if(bmesh_test_flag(v, BMESH_SELECT)) mv->flag |= 1;
 		if(bmesh_test_flag(v, BMESH_HIDDEN)) mv->flag |= ME_HIDE;
 		mv->bweight = (char)(255.0*v1->bweight);
diff --git a/source/blender/bmesh/operators/mesh_conv.c b/source/blender/bmesh/operators/mesh_conv.c
index 54fd083d389..731cdc0e231 100644
--- a/source/blender/bmesh/operators/mesh_conv.c
+++ b/source/blender/bmesh/operators/mesh_conv.c
@@ -331,7 +331,7 @@ static void loops_to_corners(BMesh *bm, Mesh *me, int findex,
 	MLoopUV *mloopuv;
 	int i, j;
 
-	for(i=0; i < numTex; i++){
+	for(i=0; i < numTex; i++) {
 		texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
 		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->head.data, CD_MTEXPOLY, i);
 		
diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c
index 1ea45853a54..e93f2ea77dc 100644
--- a/source/blender/bmesh/tools/BME_bevel.c
+++ b/source/blender/bmesh/tools/BME_bevel.c
@@ -85,13 +85,23 @@ BME_TransData *BME_assign_transdata(
 
 	vtd->bm = bm;
 	vtd->v = v;
-	if (co != NULL) copy_v3_v3(vtd->co,co);
-	if (org == NULL && is_new) { copy_v3_v3(vtd->org,v->co); } /* default */
-	else if (org != NULL) copy_v3_v3(vtd->org,org);
+
+	if (co != NULL) {
+		copy_v3_v3(vtd->co, co);
+	}
+
+	if (org == NULL && is_new) {
+		copy_v3_v3(vtd->org, v->co); /* default */
+	}
+	else if (org != NULL) {
+		copy_v3_v3(vtd->org,org);
+	}
+
 	if (vec != NULL) {
 		copy_v3_v3(vtd->vec,vec);
 		normalize_v3(vtd->vec);
 	}
+
 	vtd->loc = loc;
 
 	vtd->factor = factor;
@@ -352,19 +362,19 @@ static float BME_bevel_set_max(BMVert *v1, BMVert *v2, float value, BME_TransDat
 	BME_TransData *vtd1, *vtd2;
 	float max, fac1, fac2, vec1[3], vec2[3], vec3[3];
 
-	BME_bevel_get_vec(vec1,v1,v2,td);
-	vtd1 = BME_get_transdata(td,v1);
-	vtd2 = BME_get_transdata(td,v2);
+	BME_bevel_get_vec(vec1, v1, v2, td);
+	vtd1 = BME_get_transdata(td, v1);
+	vtd2 = BME_get_transdata(td, v2);
 
 	if (vtd1->loc == NULL) {
 		fac1 = 0;
 	}
 	else {
-		copy_v3_v3(vec2,vtd1->vec);
-		mul_v3_fl(vec2,vtd1->factor);
+		copy_v3_v3(vec2, vtd1->vec);
+		mul_v3_fl(vec2, vtd1->factor);
 		if (dot_v3v3(vec1, vec1)) {
-			project_v3_v3v3(vec2,vec2,vec1);
-			fac1 = len_v3(vec2)/value;
+			project_v3_v3v3(vec2, vec2,vec1);
+			fac1 = len_v3(vec2) / value;
 		}
 		else {
 			fac1 = 0;
@@ -375,11 +385,11 @@ static float BME_bevel_set_max(BMVert *v1, BMVert *v2, float value, BME_TransDat
 		fac2 = 0;
 	}
 	else {
-		copy_v3_v3(vec3,vtd2->vec);
-		mul_v3_fl(vec3,vtd2->factor);
+		copy_v3_v3(vec3, vtd2->vec);
+		mul_v3_fl(vec3, vtd2->factor);
 		if (dot_v3v3(vec1, vec1)) {
-			project_v3_v3v3(vec2,vec3,vec1);
-			fac2 = len_v3(vec2)/value;
+			project_v3_v3v3(vec2, vec3, vec1);
+			fac2 = len_v3(vec2) / value;
 		}
 		else {
 			fac2 = 0;
@@ -387,7 +397,7 @@ static float BME_bevel_set_max(BMVert *v1, BMVert *v2, float value, BME_TransDat
 	}
 
 	if (fac1 || fac2) {
-		max = len_v3(vec1)/(fac1 + fac2);
+		max = len_v3(vec1) / (fac1 + fac2);
 		if (vtd1->max && (*vtd1->max < 0 || max < *vtd1->max)) {
 			*vtd1->max = max;
 		}
@@ -876,7 +886,7 @@ static BMMesh *BME_bevel_mesh(BMMesh *bm, float value, int res, int options, int
 }
 
 BMesh *BME_bevel(BMMesh *bm, float value, int res, int options, int defgrp_index, float angle, BME_TransData_Head **rtd)
-		{
+{
 	BMVert *v;
 	BMEdge *e;
 	BMIter *verts;
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c
index 441208b592b..8dbcc959489 100644
--- a/source/blender/editors/mesh/bmesh_tools.c
+++ b/source/blender/editors/mesh/bmesh_tools.c
@@ -1871,9 +1871,7 @@ static int mesh_rotate_uvs(bContext *C, wmOperator *op)
 	/* dependencies graph and notification stuff */
 	DAG_id_tag_update(ob->data, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-/*	DAG_id_tag_update(ob->data, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-*/
+
 	/* we succeeded */
 	return OPERATOR_FINISHED;
 }
@@ -1897,9 +1895,7 @@ static int mesh_reverse_uvs(bContext *C, wmOperator *op)
 	/* dependencies graph and notification stuff */
 	DAG_id_tag_update(ob->data, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-/*	DAG_id_tag_update(ob->data, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-*/
+
 	/* we succeeded */
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/mesh/bmeshutils.c b/source/blender/editors/mesh/bmeshutils.c
index c019ebebb25..277b0796a6a 100644
--- a/source/blender/editors/mesh/bmeshutils.c
+++ b/source/blender/editors/mesh/bmeshutils.c
@@ -802,7 +802,6 @@ void EDBM_CacheMirrorVerts(BMEditMesh *em, const short use_select)
 	BMBVHTree *tree = BMBVH_NewBVH(em, 0, NULL, NULL);
 	BMIter iter;
 	BMVert *v;
-	/* float invmat[4][4]; */ /* UNUSED */
 	int li, topo = 0;
 
 	if (me && (me->editflag & ME_EDIT_MIRROR_TOPO)) {
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index 4483e650b29..bf37396a17e 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -312,36 +312,42 @@ int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_s
 	BMEditMesh *em;
 	int layernum;
 
-	if(me->edit_btmesh) {
+	if (me->edit_btmesh) {
 		em= me->edit_btmesh;
 
-		layernum= CustomData_number_of_layers(&em->bm->pdata, CD_MTEXPOLY);
-		if(layernum >= MAX_MTFACE)
+		layernum = CustomData_number_of_layers(&em->bm->pdata, CD_MTEXPOLY);
+		if (layernum >= MAX_MTFACE) {
 			return 0;
+		}
 
 		BM_add_data_layer(em->bm, &em->bm->pdata, CD_MTEXPOLY);
 		CustomData_set_layer_active(&em->bm->pdata, CD_MTEXPOLY, layernum);
 		CustomData_set_layer_name(&em->bm->pdata, CD_MTEXPOLY, layernum, name);
 
-		if(layernum) /* copy data from active UV */
+		/* copy data from active UV */
+		if (layernum) {
 			copy_editface_active_customdata(em, CD_MTFACE, layernum);
+		}
 
-		if(active_set || layernum==0)
+		if (active_set || layernum == 0) {
 			CustomData_set_layer_active(&em->bm->pdata, CD_MTEXPOLY, layernum);
+		}
 
 		BM_add_data_layer(em->bm, &em->bm->ldata, CD_MLOOPUV);
 		CustomData_set_layer_name(&em->bm->ldata, CD_MLOOPUV, layernum, name);
 		
 		CustomData_set_layer_active(&em->bm->ldata, CD_MLOOPUV, layernum);
-		if(active_set || layernum==0)
+		if(active_set || layernum == 0) {
 			CustomData_set_layer_active(&em->bm->ldata, CD_MLOOPUV, layernum);
+		}
 	}
 	else {
-		layernum= CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
-		if(layernum >= MAX_MTFACE)
+		layernum = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
+		if (layernum >= MAX_MTFACE) {
 			return 0;
+		}
 
-		if(me->mtpoly) {
+		if (me->mtpoly) {
 			CustomData_add_layer_named(&me->pdata, CD_MTEXPOLY, CD_DUPLICATE, me->mtpoly, me->totpoly, name);
 			CustomData_add_layer_named(&me->ldata, CD_MLOOPUV, CD_DUPLICATE, me->mloopuv, me->totloop, name);
 			CustomData_add_layer_named(&me->fdata, CD_MTFACE, CD_DUPLICATE, me->mtface, me->totface, name);
@@ -351,7 +357,7 @@ int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_s
 			CustomData_add_layer_named(&me->fdata, CD_MTFACE, CD_DEFAULT, NULL, me->totface, name);
 		}
 		
-		if(active_set || layernum==0) {
+		if (active_set || layernum == 0) {
 			CustomData_set_layer_active(&me->pdata, CD_MTEXPOLY, layernum);
 			CustomData_set_layer_active(&me->ldata, CD_MLOOPUV, layernum);
 
@@ -398,26 +404,31 @@ int ED_mesh_color_add(bContext *C, Scene *UNUSED(scene), Object *UNUSED(ob), Mes
 	BMEditMesh *em;
 	int layernum;
 
-	if(me->edit_btmesh) {
+	if (me->edit_btmesh) {
 		em= me->edit_btmesh;
 
 		layernum= CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPCOL);
-		if(layernum >= MAX_MCOL)
+		if (layernum >= MAX_MCOL) {
 			return 0;
+		}
 
 		BM_add_data_layer(em->bm, &em->bm->pdata, CD_MLOOPCOL);
 		CustomData_set_layer_active(&em->bm->ldata, CD_MLOOPCOL, layernum);
 
-		if(layernum) /* copy data from active vertex color layer */
+		/* copy data from active vertex color layer */
+		if (layernum) {
 			copy_editface_active_customdata(em, CD_MCOL, layernum);
+		}
 
-		if(active_set || layernum==0)
+		if (active_set || layernum == 0) {
 			CustomData_set_layer_active(&em->bm->ldata, CD_MLOOPCOL, layernum);
+		}
 	}
 	else {
 		layernum= CustomData_number_of_layers(&me->ldata, CD_MLOOPCOL);
-		if(layernum >= CD_MLOOPCOL)
+		if (layernum >= CD_MLOOPCOL) {
 			return 0;
+		}
 
 		if(me->mloopcol) {
 			CustomData_add_layer_named(&me->ldata, CD_MLOOPCOL, CD_DUPLICATE, me->mloopcol, me->totloop, name);
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 0430dbed48d..3a8fecc133c 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -69,7 +69,7 @@ typedef struct MVert {
 
 /* tesselation vertex color data.
  * at the moment alpha is abused for vertex painting
- * and not used for transperency, note that red and blue are swapped */
+ * and not used for transparency, note that red and blue are swapped */
 typedef struct MCol {
 	char a, r, g, b;	
 } MCol;
@@ -107,7 +107,7 @@ typedef struct MLoopUV{
 #define MLOOPUV_PINNED	4
 
 /* at the moment alpha is abused for vertex painting
- * and not used for transperency, note that red and blue are swapped */
+ * and not used for transparency, note that red and blue are swapped */
 typedef struct MLoopCol{
 	char a, r, g, b;
 } MLoopCol;
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 49f012a4b4d..197802bfc23 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -390,7 +390,7 @@ static void init_structDNA(SDNA *sdna, int do_endian_swap)
 		while(nr<sdna->nr_types) {
 			sdna->types[nr]= cp;
 			
-			/* this is a patch, to change struct names without a confict with SDNA */
+			/* this is a patch, to change struct names without a conflict with SDNA */
 			/* be careful to use it, in this case for a system-struct (opengl/X) */
 			
 			if( *cp == 'b') {
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 464d50b9fd7..ce3654e9585 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -356,18 +356,6 @@ static void rna_MeshFace_material_index_range(PointerRNA *ptr, int *min, int *ma
 	*max= MAX2(0, *max);
 }
 
-static int rna_CustomDataLayer_length(CustomData *data, int type)
-{
-	CustomDataLayer *layer;
-	int i, length= 0;
-
-	for(layer=data->layers, i=0; i<data->totlayer; layer++, i++)
-		if(layer->type == type)
-			length++;
-
-	return length;
-}
-
 static int rna_CustomDataLayer_active_get(PointerRNA *ptr, CustomData *data, int type, int render)
 {
 	int n= ((CustomDataLayer*)ptr->data) - data->layers;
@@ -420,7 +408,7 @@ static void rna_Mesh_uv_loop_layers_begin(CollectionPropertyIterator *iter, Poin
 
 static int rna_Mesh_uv_loop_layers_length(PointerRNA *ptr)
 {
-	return rna_CustomDataLayer_length(rna_mesh_ldata(ptr), CD_MLOOPUV);
+	return CustomData_number_of_layers(rna_mesh_ldata(ptr), CD_MLOOPUV);
 }
 
 static PointerRNA rna_Mesh_active_uv_loop_layer_get(PointerRNA *ptr)
@@ -564,7 +552,7 @@ static void rna_Mesh_uv_textures_begin(CollectionPropertyIterator *iter, Pointer
 
 static int rna_Mesh_uv_textures_length(PointerRNA *ptr)
 {
-	return rna_CustomDataLayer_length(rna_mesh_pdata(ptr), CD_MTEXPOLY);
+	return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_MTEXPOLY);
 }
 
 static PointerRNA rna_Mesh_active_uv_texture_get(PointerRNA *ptr)
@@ -792,7 +780,7 @@ static void rna_Mesh_vertex_colors_begin(CollectionPropertyIterator *iter, Point
 
 static int rna_Mesh_vertex_colors_length(PointerRNA *ptr)
 {
-	return rna_CustomDataLayer_length(rna_mesh_ldata(ptr), CD_MLOOPCOL);
+	return CustomData_number_of_layers(rna_mesh_ldata(ptr), CD_MLOOPCOL);
 }
 
 static PointerRNA rna_Mesh_active_vertex_color_get(PointerRNA *ptr)
@@ -918,7 +906,7 @@ static void rna_Mesh_float_layers_begin(CollectionPropertyIterator *iter, Pointe
 
 static int rna_Mesh_float_layers_length(PointerRNA *ptr)
 {
-	return rna_CustomDataLayer_length(rna_mesh_pdata(ptr), CD_PROP_FLT);
+	return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_FLT);
 }
 
 static int rna_int_layer_check(CollectionPropertyIterator *iter, void *data)
@@ -948,7 +936,7 @@ static void rna_Mesh_int_layers_begin(CollectionPropertyIterator *iter, PointerR
 
 static int rna_Mesh_int_layers_length(PointerRNA *ptr)
 {
-	return rna_CustomDataLayer_length(rna_mesh_pdata(ptr), CD_PROP_INT);
+	return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_INT);
 }
 
 static int rna_string_layer_check(CollectionPropertyIterator *iter, void *data)
@@ -978,7 +966,7 @@ static void rna_Mesh_string_layers_begin(CollectionPropertyIterator *iter, Point
 
 static int rna_Mesh_string_layers_length(PointerRNA *ptr)
 {
-	return rna_CustomDataLayer_length(rna_mesh_pdata(ptr), CD_PROP_STR);
+	return CustomData_number_of_layers(rna_mesh_pdata(ptr), CD_PROP_STR);
 }
 
 static void rna_TextureFace_image_set(PointerRNA *ptr, PointerRNA value)