diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
| commit | f026266e185f90543138a856898f50b2295a12fc (patch) | |
| tree | f674a1a1b328a423ec4bdcdc4a11f35e56669e7a /source/blender/editors/uvedit/uvedit_draw.c | |
| parent | b7fe3258b66698f62f630d0b18431b54b65101ed (diff) | |
merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_draw.c')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_draw.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 74ffc0b0725..372caa5564e 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -38,6 +38,7 @@ #include "BKE_customdata.h" #include "BKE_DerivedMesh.h" +#include "BKE_mesh.h" #include "BKE_object.h" #include "BKE_utildefines.h" #include "BKE_mesh.h" @@ -121,7 +122,7 @@ static void draw_uvs_shadow(SpaceImage *sima, Object *obedit) EditFace *efa; TFace *tf; - em= EM_GetEditMesh((Mesh*)obedit->data); + em= BKE_mesh_get_editmesh((Mesh*)obedit->data); /* draws the grey mesh when painting */ glColor3ub(112, 112, 112); @@ -137,7 +138,7 @@ static void draw_uvs_shadow(SpaceImage *sima, Object *obedit) glEnd(); } - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); } static int draw_uvs_dm_shadow(DerivedMesh *dm) @@ -429,7 +430,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) int drawfaces, interpedges, lastsel, sel; Image *ima= sima->image; - em= EM_GetEditMesh(me); + em= BKE_mesh_get_editmesh(me); activetf= EM_get_active_mtface(em, &efa_act, NULL, 0); /* will be set to NULL if hidden */ settings= scene->toolsettings; @@ -450,7 +451,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) /* first try existing derivedmesh */ if(!draw_uvs_dm_shadow(em->derivedFinal)) { /* create one if it does not exist */ - cagedm = editbmesh_get_derived_cage_and_final(scene, obedit, em, &finaldm, CD_MASK_BAREMESH|CD_MASK_MTFACE); + cagedm = editbmesh_get_derived_cage_and_final(scene, obedit, me->edit_btmesh, &finaldm, CD_MASK_BAREMESH|CD_MASK_MTFACE); /* when sync selection is enabled, all faces are drawn (except for hidden) * so if cage is the same as the final, theres no point in drawing this */ @@ -827,7 +828,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) } glPointSize(1.0); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); } void draw_uvedit_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *obedit) |