diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 07:40:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 07:40:02 +0400 |
| commit | a96c3ce9e0a61bc29fef8212a742658795aabbed (patch) | |
| tree | 7898cfa7c8fa6b84efad05183bfe6d1234ec6481 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 685041d53a5a86c6c30fff6995a3873c4fb7d0af (diff) | |
fix compile errors for previous merge
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 31046603216..56215f6523c 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -797,12 +797,14 @@ static int tex_mat_set_face_mesh_cb(void *userData, int index) return !(mface->flag & ME_HIDE); } -static int tex_mat_set_face_editmesh_cb(void *UNUSED(userData), int index) +static int tex_mat_set_face_editmesh_cb(void *userData, int index) { /* editmode face hiding */ - EditFace *efa= EM_get_face_for_index(index); + TexMatCallback *data= (TexMatCallback*)userData; + Mesh *me = (Mesh*)data->me; + BMFace *efa= EDBM_get_face_for_index(me->edit_btmesh, index); - return !(efa->h); + return !BM_TestHFlag(efa, BM_HIDDEN); } void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *dm, int faceselect) |