Merge branch 'master' into blender2.8

1 files changed, 51 insertions, 33 deletions

diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index e25c34ddb78..15de57da09c 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -50,49 +50,65 @@ struct wmKeyConfig;
 void ED_operatortypes_uvedit(void);
 void ED_keymap_uvedit(struct wmKeyConfig *keyconf);
 
-void ED_uvedit_assign_image(struct Main *bmain, struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma);
+void ED_uvedit_assign_image(
+        struct Main *bmain, struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma);
 bool ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obedit, float min[2], float max[2]);
 bool ED_uvedit_center(Scene *scene, Image *ima, struct Object *obedit, float cent[2], char mode);
 void ED_uvedit_select_all(struct BMesh *bm);
 
-bool ED_object_get_active_image(struct Object *ob, int mat_nr,
-                                struct Image **r_ima, struct ImageUser **r_iuser, struct bNode **r_node, struct bNodeTree **r_ntree);
+bool ED_object_get_active_image(
+        struct Object *ob, int mat_nr,
+        struct Image **r_ima, struct ImageUser **r_iuser, struct bNode **r_node, struct bNodeTree **r_ntree);
 void ED_object_assign_active_image(struct Main *bmain, struct Object *ob, int mat_nr, struct Image *ima);
 
 bool ED_uvedit_test(struct Object *obedit);
 
 /* visibility and selection */
-bool uvedit_face_visible_test(struct Scene *scene, struct Object *obedit, struct Image *ima, struct BMFace *efa);
-bool uvedit_face_select_test(struct Scene *scene, struct BMFace *efa,
-                             const int cd_loop_uv_offset);
-bool uvedit_edge_select_test(struct Scene *scene, struct BMLoop *l,
-                             const int cd_loop_uv_offset);
-bool uvedit_uv_select_test(struct Scene *scene, struct BMLoop *l,
-                           const int cd_loop_uv_offset);
+bool uvedit_face_visible_test(
+        struct Scene *scene, struct Object *obedit, struct Image *ima, struct BMFace *efa);
+bool uvedit_face_select_test(
+        struct Scene *scene, struct BMFace *efa,
+        const int cd_loop_uv_offset);
+bool uvedit_edge_select_test(
+        struct Scene *scene, struct BMLoop *l,
+        const int cd_loop_uv_offset);
+bool uvedit_uv_select_test(
+        struct Scene *scene, struct BMLoop *l,
+        const int cd_loop_uv_offset);
 /* uv face */
-bool uvedit_face_select_set(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const bool select,
-                            const bool do_history, const int cd_loop_uv_offset);
-bool uvedit_face_select_enable(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa,
-                               const bool do_history, const int cd_loop_uv_offset);
-bool uvedit_face_select_disable(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa,
-                                const int cd_loop_uv_offset);
+bool uvedit_face_select_set(
+        struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const bool select,
+        const bool do_history, const int cd_loop_uv_offset);
+bool uvedit_face_select_enable(
+        struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa,
+        const bool do_history, const int cd_loop_uv_offset);
+bool uvedit_face_select_disable(
+        struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa,
+        const int cd_loop_uv_offset);
 /* uv edge */
-void uvedit_edge_select_set(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l, const bool select,
-                            const bool do_history, const int cd_loop_uv_offset);
-void uvedit_edge_select_enable(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
-                               const bool do_history, const int cd_loop_uv_offset);
-void uvedit_edge_select_disable(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
-                                const int cd_loop_uv_offset);
+void uvedit_edge_select_set(
+        struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l, const bool select,
+        const bool do_history, const int cd_loop_uv_offset);
+void uvedit_edge_select_enable(
+        struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
+        const bool do_history, const int cd_loop_uv_offset);
+void uvedit_edge_select_disable(
+        struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
+        const int cd_loop_uv_offset);
 /* uv vert */
-void uvedit_uv_select_set(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l, const bool select,
-                          const bool do_history, const int cd_loop_uv_offset);
-void uvedit_uv_select_enable(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
-                             const bool do_history, const int cd_loop_uv_offset);
-void uvedit_uv_select_disable(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
-                              const int cd_loop_uv_offset);
-
-bool ED_uvedit_nearest_uv(struct Scene *scene, struct Object *obedit, struct Image *ima,
-                          const float co[2], float r_uv[2]);
+void uvedit_uv_select_set(
+        struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l, const bool select,
+        const bool do_history, const int cd_loop_uv_offset);
+void uvedit_uv_select_enable(
+        struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
+        const bool do_history, const int cd_loop_uv_offset);
+void uvedit_uv_select_disable(
+        struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
+        const int cd_loop_uv_offset);
+
+bool ED_uvedit_nearest_uv(
+        struct Scene *scene, struct Object *obedit, struct Image *ima,
+        const float co[2], float r_uv[2]);
 
 void ED_uvedit_get_aspect(struct Scene *scene, struct Object *ob, struct BMesh *em, float *aspx, float *aspy);
 
@@ -102,7 +118,8 @@ void ED_uvedit_live_unwrap_re_solve(void);
 void ED_uvedit_live_unwrap_end(short cancel);
 
 void ED_uvedit_live_unwrap(struct Scene *scene, struct Object *obedit);
-void ED_uvedit_pack_islands(struct Scene *scene, struct Object *ob, struct BMesh *bm, bool selected, bool correct_aspect, bool do_rotate);
+void ED_uvedit_pack_islands(
+struct Scene *scene, struct Object *ob, struct BMesh *bm, bool selected, bool correct_aspect, bool do_rotate);
 void ED_uvedit_unwrap_cube_project(
         struct BMesh *bm, float cube_size, bool use_select, const float center[3]);
 
@@ -111,7 +128,8 @@ void ED_unwrap_lscm(struct Scene *scene, struct Object *obedit, const short sel)
 
 
 /* uvedit_draw.c */
-void ED_image_draw_cursor(struct ARegion *ar, const float cursor[2]);
+void ED_image_draw_cursor(
+struct ARegion *ar, const float cursor[2]);
 void ED_uvedit_draw_main(
         struct SpaceImage *sima, const struct EvaluationContext *eval_ctx,
         struct ARegion *ar, struct Scene *scene, struct ViewLayer *view_layer,