[Bf-blender-cvs] [8d8de28] temp-derivedmesh-looptri: Use MTexPoly for drawing callbacks

[Campbell Barton]

Commit: 8d8de28d72239c4f95d92de8aff581cbb0ebfaaf
Author: Campbell Barton
Date:   Sun Jul 12 06:38:19 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rB8d8de28d72239c4f95d92de8aff581cbb0ebfaaf

Use MTexPoly for drawing callbacks

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

M	source/blender/editors/space_view3d/drawmesh.c

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

diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 7349380..89d602b 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -80,8 +80,8 @@ typedef struct drawEMTFMapped_userData {
 	BMEditMesh *em;
 	bool has_mcol;
 	bool has_mtface;
-	MFace *mf;
-	MTFace *tf;
+	const MPoly *mp;
+	const MTexPoly *tf;
 } drawEMTFMapped_userData;
 
 typedef struct drawTFace_userData {
@@ -885,7 +885,7 @@ static int compareDrawOptionsEm(void *userData, int cur_index, int next_index)
 {
 	drawEMTFMapped_userData *data = userData;
 
-	if (data->mf && data->mf[cur_index].mat_nr != data->mf[next_index].mat_nr)
+	if (data->mp && data->mp[cur_index].mat_nr != data->mp[next_index].mat_nr)
 		return 0;
 
 	if (data->tf && data->tf[cur_index].tpage != data->tf[next_index].tpage)
@@ -919,8 +919,8 @@ static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d
 		data.em = me->edit_btmesh;
 		data.has_mcol = CustomData_has_layer(&me->edit_btmesh->bm->ldata, CD_MLOOPCOL);
 		data.has_mtface = CustomData_has_layer(&me->edit_btmesh->bm->pdata, CD_MTEXPOLY);
-		data.mf = DM_get_tessface_data_layer(dm, CD_MFACE);
-		data.tf = DM_get_tessface_data_layer(dm, CD_MTFACE);
+		data.mp = DM_get_poly_data_layer(dm, CD_MPOLY);
+		data.tf = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
 
 		dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, compareDrawOptionsEm, &data, 0);
 	}