diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-12 06:51:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-12 06:51:45 +0300 |
commit | 25502a9bdcb74f5a9363a44dac18726f0c15c669 (patch) | |
tree | 4e23769c8f1ce6d54049d04e3d3eee1b5a10b25a /source/blender/editors/space_image | |
parent | 1966924467c901d541bfe3f510d21a20c29842e3 (diff) |
Cleanup: sync EDBM_uv_* functions w/ 2.8
They're nearly the same, so keep names matching to avoid conflicts.
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r-- | source/blender/editors/space_image/image_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_image/space_image.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 8f2f6595408..9d7944a25d3 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -365,7 +365,7 @@ bool ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit) struct BMEditMesh *em = BKE_editmesh_from_object(obedit); bool ret; - ret = EDBM_mtexpoly_check(em); + ret = EDBM_uv_check(em); return ret; } diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index ba67eb4683f..bac3b9f8df7 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -434,12 +434,9 @@ static void image_refresh(const bContext *C, ScrArea *sa) } else { /* old shading system, we set texface */ - MTexPoly *tf; - - if (em && EDBM_mtexpoly_check(em)) { - tf = EDBM_mtexpoly_active_get(em, NULL, sloppy, selected); - - if (tf) { + if (em && EDBM_uv_check(em)) { + MTexPoly *tf; + if (EDBM_uv_active_face_get(em, sloppy, selected, &tf)) { /* don't need to check for pin here, see above */ sima->image = tf->tpage; |