[Bf-blender-cvs] [987c3a3e220] master: Merge branch 'blender-v3.3-release'

[Brecht Van Lommel]

Commit: 987c3a3e220b273b9110aaa5fe28a85a5761a54d
Author: Brecht Van Lommel
Date:   Tue Sep 6 16:13:40 2022 +0200
Branches: master
https://developer.blender.org/rB987c3a3e220b273b9110aaa5fe28a85a5761a54d

Merge branch 'blender-v3.3-release'

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



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

diff --cc source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
index fa39957a7fc,e2d939b18a1..2f2e59c8c3b
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
@@@ -212,9 -212,16 +212,16 @@@ static void extract_edituv_lines_iter_p
    const MLoop *mloop = mr->mloop;
    const int ml_index_end = mp->loopstart + mp->totloop;
  
-   const BMFace *efa = bm_original_face_get(mr, mp_index);
-   const bool mp_hidden = (efa) ? BM_elem_flag_test_bool(efa, BM_ELEM_HIDDEN) : true;
-   const bool mp_select = (efa) ? BM_elem_flag_test_bool(efa, BM_ELEM_SELECT) : false;
+   bool mp_hidden, mp_select;
+   if (mr->bm) {
+     const BMFace *efa = bm_original_face_get(mr, mp_index);
+     mp_hidden = (efa) ? BM_elem_flag_test_bool(efa, BM_ELEM_HIDDEN) : true;
+     mp_select = (efa) ? BM_elem_flag_test_bool(efa, BM_ELEM_SELECT) : false;
+   }
+   else {
 -    mp_hidden = (mp->flag & ME_HIDE) != 0;
++    mp_hidden = (mr->hide_poly) ? mr->hide_poly[mp_index] : false;
+     mp_select = (mp->flag & ME_FACE_SEL) != 0;
+   }
  
    for (int ml_index = mp->loopstart; ml_index < ml_index_end; ml_index += 1) {
      const MLoop *ml = &mloop[ml_index];
@@@ -285,9 -292,16 +292,16 @@@ static void extract_edituv_lines_iter_s
    MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(_data);
    int *subdiv_loop_edge_index = (int *)GPU_vertbuf_get_data(subdiv_cache->edges_orig_index);
  
-   const BMFace *efa = bm_original_face_get(mr, coarse_poly - mr->mpoly);
-   const bool mp_hidden = (efa) ? BM_elem_flag_test_bool(efa, BM_ELEM_HIDDEN) : true;
-   const bool mp_select = (efa) ? BM_elem_flag_test_bool(efa, BM_ELEM_SELECT) : false;
+   bool mp_hidden, mp_select;
+   if (mr->bm) {
+     const BMFace *efa = bm_original_face_get(mr, coarse_poly - mr->mpoly);
+     mp_hidden = (efa) ? BM_elem_flag_test_bool(efa, BM_ELEM_HIDDEN) : true;
+     mp_select = (efa) ? BM_elem_flag_test_bool(efa, BM_ELEM_SELECT) : false;
+   }
+   else {
 -    mp_hidden = (coarse_poly->flag & ME_HIDE) != 0;
++    mp_hidden = (mr->hide_poly) ? mr->hide_poly[coarse_poly - mr->mpoly] : false;
+     mp_select = (coarse_poly->flag & ME_FACE_SEL) != 0;
+   }
  
    uint start_loop_idx = subdiv_quad_index * 4;
    uint end_loop_idx = (subdiv_quad_index + 1) * 4;