Commit: 2b3d680b096c2c85ed3fa1b6de6819d96ac2b202 Author: Martijn Versteegh Date: Wed Oct 26 08:09:45 2022 +0200 Branches: refactor-mesh-uv-map-generic https://developer.blender.org/rB2b3d680b096c2c85ed3fa1b6de6819d96ac2b202
Merge branch 'master' into private-uvasttrib =================================================================== =================================================================== diff --cc source/blender/editors/uvedit/uvedit_islands.cc index aeb3ffec325,4009447ba7e..5fdc223e23e --- a/source/blender/editors/uvedit/uvedit_islands.cc +++ b/source/blender/editors/uvedit/uvedit_islands.cc @@@ -487,18 -678,7 +677,8 @@@ void ED_uvedit_pack_islands_multi(cons } bm_face_array_calc_bounds( - island->faces, island->faces_len, island->cd_loop_uv_offset, &island->bounds_rect); + island->faces, island->faces_len, island->offsets.uv, &island->bounds_rect); + - BoxPack *box = &boxarray[index]; - box->index = index; - box->x = 0.0f; - box->y = 0.0f; - box->w = BLI_rctf_size_x(&island->bounds_rect); - box->h = BLI_rctf_size_y(&island->bounds_rect); - - if (margin > 0.0f) { - area += double(sqrtf(box->w * box->h)); - } } /* Center of bounding box containing all selected UVs. */ diff --cc source/blender/modifiers/intern/MOD_uvproject.cc index f707ac6834c,9861b318e82..7a37a529d8e --- a/source/blender/modifiers/intern/MOD_uvproject.cc +++ b/source/blender/modifiers/intern/MOD_uvproject.cc @@@ -52,10 -52,10 +52,10 @@@ static void initData(ModifierData *md MEMCPY_STRUCT_AFTER(umd, DNA_struct_default_get(UVProjectModifierData), modifier); } - static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks) + static void requiredDataMask(ModifierData * /*md*/, CustomData_MeshMasks *r_cddata_masks) { /* ask for UV coordinates */ - r_cddata_masks->lmask |= CD_MASK_MLOOPUV; + r_cddata_masks->lmask |= CD_MASK_PROP_FLOAT2; } static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs