[Bf-blender-cvs] [ba01cdc7707] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: ba01cdc77076f12e421ca8ffa60218b19f313662
Author: Campbell Barton
Date:   Mon Mar 12 14:59:02 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBba01cdc77076f12e421ca8ffa60218b19f313662

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/include/ED_mesh.h
index 0293f7cd204,5ed6105e5e7..5cf6ac28d5a
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@@ -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);