Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Mar 2018 03:25:20 +0000 (14:25 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Mar 2018 03:25:20 +0000 (14:25 +1100)
1  2 
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/uvedit/uvedit_intern.h
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_smart_stitch.c

index 700b096927798c124d4d7cd5f6d85ba433b31023,7b636530d617c56c1d7834690fecf8284bd068d0..6928610f2805fbb502615fcc14f8fe03fa9c893c
@@@ -650,9 -650,9 +650,9 @@@ static UvSculptData *uv_sculpt_stroke_i
                /* we need to find the active island here */
                if (do_island_optimization) {
                        UvElement *element;
-                       NearestHit hit;
+                       UvNearestHit hit = UV_NEAREST_HIT_INIT;
                        Image *ima = CTX_data_edit_image(C);
-                       uv_find_nearest_vert(scene, ima, obedit, em, co, NULL, &hit);
 -                      uv_find_nearest_vert(scene, ima, em, co, 0.0f, &hit);
++                      uv_find_nearest_vert(scene, ima, obedit, co, 0.0f, &hit);
  
                        element = BM_uv_element_get(data->elementMap, hit.efa, hit.l);
                        island_index = element->island;
index eb92f17544f985ac57d97035181a3c3fac7cbd48,b5ff46e921997a5e5b39ca314b9ee19a2999b2d7..c5f16d6fb14fbb2f3dc4becdf4d800ea26ae0b1d
@@@ -50,19 -51,31 +50,30 @@@ void  uv_poly_center(struct BMFace *f, 
  
  /* find nearest */
  
- typedef struct NearestHit {
+ typedef struct UvNearestHit {
+       /** Always set if we have a hit. */
        struct BMFace *efa;
 -      struct MTexPoly *tf;
        struct BMLoop *l;
        struct MLoopUV *luv, *luv_next;
-       int lindex;  /* index of loop within face */
} NearestHit;
- void uv_find_nearest_vert(
-         struct Scene *scene, struct Image *ima, struct Object *obedit, struct BMEditMesh *em,
-         const float co[2], const float penalty[2], struct NearestHit *hit);
- void uv_find_nearest_edge(
-         struct Scene *scene, struct Image *ima, struct Object *obedit, struct BMEditMesh *em,
-         const float co[2], struct NearestHit *hit);
+       /** Index of loop within face. */
      int lindex;
+       /** Needs to be set before calling nearest functions. */
+       float dist_sq;
+ } UvNearestHit;
+ #define UV_NEAREST_HIT_INIT { .dist_sq = FLT_MAX, }
+ bool uv_find_nearest_vert(
 -        struct Scene *scene, struct Image *ima, struct BMEditMesh *em,
++        struct Scene *scene, struct Image *ima, struct Object *obedit,
+         const float co[2], const float penalty_dist, struct UvNearestHit *hit_final);
+ bool uv_find_nearest_edge(
 -        struct Scene *scene, struct Image *ima, struct BMEditMesh *em,
++        struct Scene *scene, struct Image *ima, struct Object *obedit,
+         const float co[2], struct UvNearestHit *hit_final);
+ bool uv_find_nearest_face(
 -        struct Scene *scene, struct Image *ima, struct BMEditMesh *em,
++        struct Scene *scene, struct Image *ima, struct Object *obedit,
+         const float co[2], struct UvNearestHit *hit_final);
  
  /* utility tool functions */
  
index 61e0004915d2ea4c3db2377a793fcde06b30b7f8,1ee10268be557b6fc9dd08e77c118dfe13f1dae9..1c54ea0ebc184fee09856fa60ce2b0f2b9c1f072
@@@ -707,35 -760,38 +707,35 @@@ bool ED_uvedit_center(Scene *scene, Ima
  
  /************************** find nearest ****************************/
  
- void uv_find_nearest_edge(Scene *scene, Image *ima, Object *obedit, BMEditMesh *em, const float co[2], NearestHit *hit)
+ bool uv_find_nearest_edge(
 -        Scene *scene, Image *ima, BMEditMesh *em, const float co[2],
++        Scene *scene, Image *ima, Object *obedit, const float co[2],
+         UvNearestHit *hit)
  {
 -      MTexPoly *tf;
++      BMEditMesh *em = BKE_editmesh_from_object(obedit);
        BMFace *efa;
        BMLoop *l;
        BMIter iter, liter;
        MLoopUV *luv, *luv_next;
-       float mindist_squared, dist_squared;
        int i;
+       bool found = false;
  
        const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 -      const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
  
-       mindist_squared = 1e10f;
-       memset(hit, 0, sizeof(*hit));
        BM_mesh_elem_index_ensure(em->bm, BM_VERT);
-       
        BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-               if (!uvedit_face_visible_test(scene, obedit, ima, efa))
 -              tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
 -              if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
++              if (!uvedit_face_visible_test(scene, obedit, ima, efa)) {
                        continue;
-               
+               }
                BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
                        luv      = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
                        luv_next = BM_ELEM_CD_GET_VOID_P(l->next, cd_loop_uv_offset);
  
-                       dist_squared = dist_squared_to_line_segment_v2(co, luv->uv, luv_next->uv);
+                       const float dist_test_sq = dist_squared_to_line_segment_v2(co, luv->uv, luv_next->uv);
  
-                       if (dist_squared < mindist_squared) {
+                       if (dist_test_sq < hit->dist_sq) {
 -                              hit->tf = tf;
                                hit->efa = efa;
-                               
                                hit->l = l;
                                hit->luv = luv;
                                hit->luv_next = luv_next;
                        }
                }
        }
+       return found;
  }
  
- static void uv_find_nearest_face(
-         Scene *scene, Image *ima, Object *obedit, BMEditMesh *em, const float co[2], NearestHit *hit)
+ bool uv_find_nearest_face(
 -        Scene *scene, Image *ima, BMEditMesh *em, const float co[2],
++        Scene *scene, Image *ima, Object *obedit, const float co[2],
+         UvNearestHit *hit_final)
  {
-       BMFace *efa;
-       BMIter iter;
-       float mindist, dist, cent[2];
++      BMEditMesh *em = BKE_editmesh_from_object(obedit);
+       bool found = false;
  
        const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 -      const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
  
-       mindist = 1e10f;
-       memset(hit, 0, sizeof(*hit));
+       /* this will fill in hit.vert1 and hit.vert2 */
+       float dist_sq_init = hit_final->dist_sq;
+       UvNearestHit hit = *hit_final;
 -      if (uv_find_nearest_edge(scene, ima, em, co, &hit)) {
++      if (uv_find_nearest_edge(scene, ima, obedit, co, &hit)) {
+               hit.dist_sq = dist_sq_init;
+               hit.l = NULL;
+               hit.luv = hit.luv_next = NULL;
  
-       /*this will fill in hit.vert1 and hit.vert2*/
-       uv_find_nearest_edge(scene, ima, obedit, em, co, hit);
-       hit->l = NULL;
-       hit->luv = hit->luv_next = NULL;
+               BMIter iter;
+               BMFace *efa;
  
-       BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-               if (!uvedit_face_visible_test(scene, obedit, ima, efa))
-                       continue;
+               BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 -                      MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
 -                      if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
++                      if (!uvedit_face_visible_test(scene, obedit, ima, efa)) {
+                               continue;
+                       }
  
-               uv_poly_center(efa, cent, cd_loop_uv_offset);
+                       float cent[2];
+                       uv_poly_center(efa, cent, cd_loop_uv_offset);
  
-               dist = len_manhattan_v2v2(co, cent);
+                       const float dist_test_sq = len_squared_v2v2(co, cent);
  
-               if (dist < mindist) {
-                       hit->efa = efa;
-                       mindist = dist;
+                       if (dist_test_sq < hit.dist_sq) {
+                               hit.efa = efa;
+                               hit.dist_sq = dist_test_sq;
+                               found = true;
+                       }
                }
        }
+       if (found) {
+               *hit_final = hit;
+       }
+       return found;
  }
  
  static bool uv_nearest_between(const BMLoop *l, const float co[2],
                (line_point_side_v2(uv_next, uv_curr, co) <= 0.0f));
  }
  
- void uv_find_nearest_vert(
-         Scene *scene, Image *ima, Object *obedit, BMEditMesh *em,
-         float const co[2], const float penalty[2], NearestHit *hit)
+ bool uv_find_nearest_vert(
 -        Scene *scene, Image *ima, BMEditMesh *em,
++        Scene *scene, Image *ima, Object *obedit,
+         float const co[2], const float penalty_dist, UvNearestHit *hit_final)
  {
-       BMFace *efa;
-       BMLoop *l;
-       BMIter iter, liter;
-       MLoopUV *luv;
-       float mindist, dist;
-       int i;
+       bool found = false;
  
-       const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+       /* this will fill in hit.vert1 and hit.vert2 */
+       float dist_sq_init = hit_final->dist_sq;
+       UvNearestHit hit = *hit_final;
 -      if (uv_find_nearest_edge(scene, ima, em, co, &hit)) {
++      if (uv_find_nearest_edge(scene, ima, obedit, co, &hit)) {
+               hit.dist_sq = dist_sq_init;
  
-       /*this will fill in hit.vert1 and hit.vert2*/
-       uv_find_nearest_edge(scene, ima, obedit, em, co, hit);
-       hit->l = NULL;
-       hit->luv = hit->luv_next = NULL;
+               hit.l = NULL;
+               hit.luv = hit.luv_next = NULL;
  
-       mindist = 1e10f;
-       memset(hit, 0, sizeof(*hit));
-       
-       BM_mesh_elem_index_ensure(em->bm, BM_VERT);
++              BMEditMesh *em = BKE_editmesh_from_object(obedit);
+               BMFace *efa;
+               BMIter iter;
  
-       BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-               if (!uvedit_face_visible_test(scene, obedit, ima, efa))
-                       continue;
+               BM_mesh_elem_index_ensure(em->bm, BM_VERT);
  
-               BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
-                       luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-                       if (penalty && uvedit_uv_select_test(scene, l, cd_loop_uv_offset))
-                               dist = len_manhattan_v2v2(co, luv->uv) + len_manhattan_v2(penalty);
-                       else
-                               dist = len_manhattan_v2v2(co, luv->uv);
+               const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 -              const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
  
-                       if (dist <= mindist) {
-                               if (dist == mindist) {
-                                       if (!uv_nearest_between(l, co, cd_loop_uv_offset)) {
-                                               continue;
-                                       }
+               BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 -                      MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
 -                      if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
++                      if (!uvedit_face_visible_test(scene, obedit, ima, efa)) {
+                               continue;
+                       }
+                       BMIter liter;
+                       BMLoop *l;
+                       int i;
+                       BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
+                               float dist_test_sq;
+                               MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+                               if (penalty_dist != 0.0f && uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
+                                       dist_test_sq = len_v2v2(co, luv->uv) + penalty_dist;
+                                       dist_test_sq = SQUARE(dist_test_sq);
+                               }
+                               else {
+                                       dist_test_sq = len_squared_v2v2(co, luv->uv);
                                }
  
-                               mindist = dist;
+                               if (dist_test_sq <= hit.dist_sq) {
+                                       if (dist_test_sq == hit.dist_sq) {
+                                               if (!uv_nearest_between(l, co, cd_loop_uv_offset)) {
+                                                       continue;
+                                               }
+                                       }
  
-                               hit->l = l;
-                               hit->luv = luv;
-                               hit->luv_next = BM_ELEM_CD_GET_VOID_P(l->next, cd_loop_uv_offset);
-                               hit->efa = efa;
-                               hit->lindex = i;
+                                       hit.dist_sq = dist_test_sq;
+                                       hit.l = l;
+                                       hit.luv = luv;
+                                       hit.luv_next = BM_ELEM_CD_GET_VOID_P(l->next, cd_loop_uv_offset);
+                                       hit.efa = efa;
+                                       hit.lindex = i;
+                                       found = true;
+                               }
                        }
                }
        }
@@@ -964,7 -1054,7 +993,7 @@@ static bool uv_select_edgeloop_edge_tag
  }
  
  static int uv_select_edgeloop(
-         Scene *scene, Image *ima, Object *obedit, BMEditMesh *em, NearestHit *hit,
 -        Scene *scene, Image *ima, BMEditMesh *em, UvNearestHit *hit,
++        Scene *scene, Image *ima, Object *obedit, BMEditMesh *em, UvNearestHit *hit,
          const float limit[2], const bool extend)
  {
        BMFace *efa;
  /*********************** linked select ***********************/
  
  static void uv_select_linked(
-         Scene *scene, Image *ima, Object *obedit, BMEditMesh *em,
-         const float limit[2], NearestHit *hit, bool extend, bool select_faces)
 -        Scene *scene, Image *ima, BMEditMesh *em, const float limit[2], UvNearestHit *hit_final,
 -        bool extend, bool select_faces)
++        Scene *scene, Image *ima, Object *obedit, BMEditMesh *em, const float limit[2],
++        UvNearestHit *hit_final, bool extend, bool select_faces)
  {
        BMFace *efa;
        BMLoop *l;
        stack = MEM_mallocN(sizeof(*stack) * (em->bm->totface + 1), "UvLinkStack");
        flag = MEM_callocN(sizeof(*flag) * em->bm->totface, "UvLinkFlag");
  
-       if (!hit) {
+       if (hit_final == NULL) {
+               /* Use existing selection */
                BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
 -                      MTexPoly *tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
 -
 -                      if (uvedit_face_visible_test(scene, ima, efa, tf)) {
 +                      if (uvedit_face_visible_test(scene, obedit, ima, efa)) {
                                if (select_faces) {
                                        if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
                                                stack[stacksize] = a;
@@@ -1985,15 -2109,16 +2015,14 @@@ static int uv_mouse_select(bContext *C
        BMFace *efa;
        BMLoop *l;
        BMIter iter, liter;
 -      MTexPoly *tf;
        MLoopUV *luv;
-       NearestHit hit;
+       UvNearestHit hit = UV_NEAREST_HIT_INIT;
        int i, selectmode, sticky, sync, *hitv = NULL;
        bool select = true;
        int flush = 0, hitlen = 0; /* 0 == don't flush, 1 == sel, -1 == desel;  only use when selection sync is enabled */
        float limit[2], **hituv = NULL;
-       float penalty[2];
  
        const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 -      const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
  
        /* notice 'limit' is the same no matter the zoom level, since this is like
         * remove doubles and could annoying if it joined points when zoomed out.
        /* find nearest element */
        if (loop) {
                /* find edge */
-               uv_find_nearest_edge(scene, ima, obedit, em, co, &hit);
-               if (hit.efa == NULL) {
 -              if (!uv_find_nearest_edge(scene, ima, em, co, &hit)) {
++              if (!uv_find_nearest_edge(scene, ima, obedit, co, &hit)) {
                        return OPERATOR_CANCELLED;
                }
  
        }
        else if (selectmode == UV_SELECT_VERTEX) {
                /* find vertex */
-               uv_find_nearest_vert(scene, ima, obedit, em, co, penalty, &hit);
-               if (hit.efa == NULL) {
 -              if (!uv_find_nearest_vert(scene, ima, em, co, penalty_dist, &hit)) {
++              if (!uv_find_nearest_vert(scene, ima, obedit, co, penalty_dist, &hit)) {
                        return OPERATOR_CANCELLED;
                }
  
        }
        else if (selectmode == UV_SELECT_EDGE) {
                /* find edge */
-               uv_find_nearest_edge(scene, ima, obedit, em, co, &hit);
-               if (hit.efa == NULL) {
 -              if (!uv_find_nearest_edge(scene, ima, em, co, &hit)) {
++              if (!uv_find_nearest_edge(scene, ima, obedit, co, &hit)) {
                        return OPERATOR_CANCELLED;
                }
  
        }
        else if (selectmode == UV_SELECT_FACE) {
                /* find face */
-               uv_find_nearest_face(scene, ima, obedit, em, co, &hit);
-               if (hit.efa == NULL) {
 -              if (!uv_find_nearest_face(scene, ima, em, co, &hit)) {
++              if (!uv_find_nearest_face(scene, ima, obedit, co, &hit)) {
                        return OPERATOR_CANCELLED;
                }
-               
                /* make active */
                BM_mesh_active_face_set(em->bm, hit.efa);
  
                hitlen = hit.efa->len;
        }
        else if (selectmode == UV_SELECT_ISLAND) {
-               uv_find_nearest_edge(scene, ima, obedit, em, co, &hit);
-               if (hit.efa == NULL) {
 -              if (!uv_find_nearest_edge(scene, ima, em, co, &hit)) {
++              if (!uv_find_nearest_edge(scene, ima, obedit, co, &hit)) {
                        return OPERATOR_CANCELLED;
                }
  
@@@ -2356,13 -2482,14 +2384,14 @@@ static int uv_select_linked_internal(bC
                        RNA_float_get_array(op->ptr, "location", co);
                }
  
-               uv_find_nearest_edge(scene, ima, obedit, em, co, &hit);
-               hit_p = &hit;
 -              if (!uv_find_nearest_edge(scene, ima, em, co, &hit)) {
++              if (!uv_find_nearest_edge(scene, ima, obedit, co, &hit)) {
+                       return OPERATOR_CANCELLED;
+               }
        }
  
-       uv_select_linked(scene, ima, obedit, em, limit, hit_p, extend, select_faces);
 -      uv_select_linked(scene, ima, em, limit, pick ? &hit : NULL, extend, select_faces);
++      uv_select_linked(scene, ima, obedit, em, limit, pick ? &hit : NULL, extend, select_faces);
  
 -      DAG_id_tag_update(obedit->data, 0);
 +      DEG_id_tag_update(obedit->data, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
  
        return OPERATOR_FINISHED;
index 9cd34c4687469700acf00f42a1a8702e903bf6a6,057417b898f45a73c4e84d797a31bacefd1727e7..4c2058183290c4682b2006833ed2b1fe06ec0752
@@@ -2134,9 -2065,9 +2134,9 @@@ static void stitch_select(bContext *C, 
        UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &co[0], &co[1]);
  
        if (state->mode == STITCH_VERT) {
-               uv_find_nearest_vert(scene, ima, state->obedit, state->em, co, NULL, &hit);
-               if (hit.efa) {
+               if (uv_find_nearest_vert(
 -                          scene, ima, state->em, co, 0.0f, &hit))
++                          scene, ima, state->obedit, co, 0.0f, &hit))
+               {
                        /* Add vertex to selection, deselect all common uv's of vert other
                         * than selected and update the preview. This behavior was decided so that
                         * you can do stuff like deselect the opposite stitchable vertex and the initial still gets deselected */
                }
        }
        else {
-               uv_find_nearest_edge(scene, ima, state->obedit, state->em, co, &hit);
-               if (hit.efa) {
+               if (uv_find_nearest_edge(
 -                          scene, ima, state->em, co, &hit))
++                          scene, ima, state->obedit, co, &hit))
+               {
                        UvEdge *edge = uv_edge_get(hit.l, state);
                        stitch_select_edge(edge, state, false);
                }