[Bf-blender-cvs] [d165b97646d] refactor-mesh-uv-map-generic: Fix some mistakes in the merge with master.

[Martijn Versteegh]

Commit: d165b97646d484c24e465ed61ee1ff6eb6b94fe3
Author: Martijn Versteegh
Date:   Fri Oct 28 11:56:13 2022 +0200
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rBd165b97646d484c24e465ed61ee1ff6eb6b94fe3

Fix some mistakes in the merge with master.

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

M	source/blender/editors/uvedit/uvedit_islands.cc

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

diff --git a/source/blender/editors/uvedit/uvedit_islands.cc b/source/blender/editors/uvedit/uvedit_islands.cc
index cc743aaf5d2..2c6a8a1a3a6 100644
--- a/source/blender/editors/uvedit/uvedit_islands.cc
+++ b/source/blender/editors/uvedit/uvedit_islands.cc
@@ -602,11 +602,10 @@ static bool island_has_pins(FaceIsland *island)
 {
   BMLoop *l;
   BMIter iter;
-  const int cd_loop_uv_offset = island->cd_loop_uv_offset;
+  const int pin_offset = island->offsets.pin;
   for (int i = 0; i < island->faces_len; i++) {
     BM_ITER_ELEM (l, &iter, island->faces[i], BM_LOOPS_OF_FACE) {
-      MLoopUV *luv = static_cast<MLoopUV *>(BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset));
-      if (luv->flag & MLOOPUV_PINNED) {
+      if (BM_ELEM_CD_GET_BOOL(l, pin_offset)) {
         return true;
       }
     }
@@ -642,7 +641,7 @@ void ED_uvedit_pack_islands_multi(const Scene *scene,
     }
     BLI_assert(bm);
 
-    const BMUVOffsets offsets = BM_uv_map_get_offsets(em->bm);
+    const BMUVOffsets offsets = BM_uv_map_get_offsets(bm);
     if (offsets.uv == -1) {
       continue;
     }