Commit: c172652e829425dbae7b9bb09c9da5ff84901173
Author: Campbell Barton
Date: Fri Jul 17 01:25:35 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rBc172652e829425dbae7b9bb09c9da5ff84901173
rename confusingly short vars
===================================================================
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 1cea81b..cf4d814 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -80,14 +80,14 @@ typedef struct drawEMTFMapped_userData {
BMEditMesh *em;
bool has_mcol;
int cd_poly_tex_offset;
- const MPoly *mp;
- const MTexPoly *tf;
+ const MPoly *mpoly;
+ const MTexPoly *mtexpoly;
} drawEMTFMapped_userData;
typedef struct drawTFace_userData {
const Mesh *me;
- const MPoly *mp;
- const MTexPoly *tf;
+ const MPoly *mpoly;
+ const MTexPoly *mtexpoly;
} drawTFace_userData;
/**************************** Face Select Mode *******************************/
@@ -902,10 +902,10 @@ static int compareDrawOptions(void *userData, int
cur_index, int next_index)
{
drawTFace_userData *data = userData;
- if (data->mp && data->mp[cur_index].mat_nr !=
data->mp[next_index].mat_nr)
+ if (data->mpoly && data->mpoly[cur_index].mat_nr !=
data->mpoly[next_index].mat_nr)
return 0;
- if (data->tf && data->tf[cur_index].tpage != data->tf[next_index].tpage)
+ if (data->mtexpoly && data->mtexpoly[cur_index].tpage !=
data->mtexpoly[next_index].tpage)
return 0;
return 1;
@@ -916,11 +916,12 @@ static int compareDrawOptionsEm(void *userData, int
cur_index, int next_index)
{
drawEMTFMapped_userData *data = userData;
- if (data->mp && data->mp[cur_index].mat_nr !=
data->mp[next_index].mat_nr)
+ if (data->mpoly && data->mpoly[cur_index].mat_nr !=
data->mpoly[next_index].mat_nr)
return 0;
- if (data->tf && data->tf[cur_index].tpage != data->tf[next_index].tpage)
+ if (data->mtexpoly && data->mtexpoly[cur_index].tpage !=
data->mtexpoly[next_index].tpage) {
return 0;
+ }
return 1;
}
@@ -951,8 +952,8 @@ static void draw_mesh_textured_old(Scene *scene, View3D
*v3d, RegionView3D *rv3d
data.has_mcol =
CustomData_has_layer(&me->edit_btmesh->bm->ldata, CD_MLOOPCOL);
data.cd_poly_tex_offset =
CustomData_get_offset(&me->edit_btmesh->bm->pdata, CD_MTEXPOLY);
- data.mp = DM_get_poly_data_layer(dm, CD_MPOLY);
- data.tf = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
+ data.mpoly = DM_get_poly_data_layer(dm, CD_MPOLY);
+ data.mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw,
compareDrawOptionsEm, &data, 0);
}
@@ -963,8 +964,8 @@ static void draw_mesh_textured_old(Scene *scene, View3D
*v3d, RegionView3D *rv3d
else {
drawTFace_userData userData;
- userData.mp = DM_get_poly_data_layer(dm, CD_MPOLY);
- userData.tf = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
+ userData.mpoly = DM_get_poly_data_layer(dm, CD_MPOLY);
+ userData.mtexpoly = DM_get_poly_data_layer(dm,
CD_MTEXPOLY);
userData.me = me;
dm->drawMappedFacesTex(dm, me->mpoly ?
draw_tface_mapped__set_draw : NULL, compareDrawOptions, &userData, uvflag);
}
@@ -974,8 +975,8 @@ static void draw_mesh_textured_old(Scene *scene, View3D
*v3d, RegionView3D *rv3d
update_tface_color_layer(dm, !(ob->mode &
OB_MODE_TEXTURE_PAINT));
- userData.mp = DM_get_poly_data_layer(dm, CD_MPOLY);
- userData.tf = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
+ userData.mpoly = DM_get_poly_data_layer(dm, CD_MPOLY);
+ userData.mtexpoly = DM_get_poly_data_layer(dm, CD_MTEXPOLY);
userData.me = NULL;
dm->drawFacesTex(dm, draw_tface__set_draw, compareDrawOptions,
&userData, uvflag);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
