Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Mar 2018 03:59:02 +0000 (14:59 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Mar 2018 04:01:22 +0000 (15:01 +1100)
1  2 
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/editmesh_utils.c

index 0293f7cd20406c6b6edbf0d8cb3e043970671989,5ed6105e5e7c26b5ad9a71df5db6fc644403bf86..5cf6ac28d5a03ab971983d218de68c06b3ee0458
@@@ -115,7 -114,9 +115,8 @@@ void                 BM_uv_element_map_
  struct UvElement    *BM_uv_element_get(struct UvElementMap *map, struct BMFace *efa, struct BMLoop *l);
  
  bool           EDBM_uv_check(struct BMEditMesh *em);
- struct BMFace *EDBM_uv_active_face_get(struct BMEditMesh *em, const bool sloppy, const bool selected);
+ struct BMFace *EDBM_uv_active_face_get(
 -        struct BMEditMesh *em, const bool sloppy, const bool selected,
 -        struct MTexPoly **r_tf);
++        struct BMEditMesh *em, const bool sloppy, const bool selected);
  
  void              BM_uv_vert_map_free(struct UvVertMap *vmap);
  struct UvMapVert *BM_uv_vert_map_at_index(struct UvVertMap *vmap, unsigned int v);