[Bf-blender-cvs] [4093630] master: Remove MTFace DM_paint_uvlayer_active_get func

[Campbell Barton]

Commit: 40936307dd3adf8df11301871aa49f2949b069da
Author: Campbell Barton
Date:   Fri Jul 17 04:26:17 2015 +1000
Branches: master
https://developer.blender.org/rB40936307dd3adf8df11301871aa49f2949b069da

Remove MTFace DM_paint_uvlayer_active_get func

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

M	source/blender/blenkernel/BKE_DerivedMesh.h
M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/subsurf_ccg.c

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

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 0a4cc7f..0974962 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -615,8 +615,7 @@ void DM_ensure_looptri(DerivedMesh *dm);
 void DM_update_tessface_data(DerivedMesh *dm);
 
 void DM_update_materials(DerivedMesh *dm, struct Object *ob);
-struct MTFace *DM_paint_uvlayer_active_get(DerivedMesh *dm, int mat_nr);
-struct MLoopUV *DM_paint_uvlayer_active_get_mloopuv(DerivedMesh *dm, int mat_nr);
+struct MLoopUV *DM_paint_uvlayer_active_get(DerivedMesh *dm, int mat_nr);
 
 void DM_interp_vert_data(
         struct DerivedMesh *source, struct DerivedMesh *dest,
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 1bf49ad..b3be4a4 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -576,30 +576,7 @@ void DM_update_materials(DerivedMesh *dm, Object *ob)
 	}
 }
 
-MTFace *DM_paint_uvlayer_active_get(DerivedMesh *dm, int mat_nr)
-{
-	MTFace *tf_base;
-
-	BLI_assert(mat_nr < dm->totmat);
-
-	if (dm->mat[mat_nr] && dm->mat[mat_nr]->texpaintslot &&
-	    dm->mat[mat_nr]->texpaintslot[dm->mat[mat_nr]->paint_active_slot].uvname)
-	{
-		tf_base = CustomData_get_layer_named(&dm->faceData, CD_MTFACE,
-		                                     dm->mat[mat_nr]->texpaintslot[dm->mat[mat_nr]->paint_active_slot].uvname);
-		/* This can fail if we have changed the name in the UV layer list and have assigned the old name in the material
-		 * texture slot.*/
-		if (!tf_base)
-			tf_base = CustomData_get_layer(&dm->faceData, CD_MTFACE);
-	}
-	else {
-		tf_base = CustomData_get_layer(&dm->faceData, CD_MTFACE);
-	}
-
-	return tf_base;
-}
-
-MLoopUV *DM_paint_uvlayer_active_get_mloopuv(DerivedMesh *dm, int mat_nr)
+MLoopUV *DM_paint_uvlayer_active_get(DerivedMesh *dm, int mat_nr)
 {
 	MLoopUV *uv_base;
 
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 6f25794..5f53fa6 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1384,7 +1384,7 @@ static void cdDM_buffer_copy_uv_texpaint(
 	uv_base = MEM_mallocN(totmaterial * sizeof(*uv_base), "texslots");
 
 	for (i = 0; i < totmaterial; i++) {
-		uv_base[i] = DM_paint_uvlayer_active_get_mloopuv(dm, i);
+		uv_base[i] = DM_paint_uvlayer_active_get(dm, i);
 	}
 
 	stencil = CustomData_get_stencil_layer(&dm->loopData, CD_MLOOPUV);
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 4bc6f62..159e26b 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2050,7 +2050,7 @@ static void ccgDM_buffer_copy_uv_texpaint(
 	mloopuv_base = MEM_mallocN(totmaterial * sizeof(*mloopuv_base), "texslots");
 
 	for (i = 0; i < totmaterial; i++) {
-		mloopuv_base[i] = DM_paint_uvlayer_active_get_mloopuv(dm, i);
+		mloopuv_base[i] = DM_paint_uvlayer_active_get(dm, i);
 	}
 
 	stencil = CustomData_get_stencil_layer(&dm->loopData, CD_MLOOPUV);