blender
/
blender
136
426
Fork 613
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

WIP: Mesh: Store active and default UV map with strings #105779

Closed
Hans Goudey wants to merge 12 commits from HooglyBoogly:mesh-uv-active-string into main
pull from: HooglyBoogly:mesh-uv-active-string
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 12 Files Changed 60 +11 -4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 730bbb2b4e - Show all commits

15
source/blender/editors/uvedit/uvedit_unwrap_ops.cc
View File

@ -103,6 +103,7 @@ static bool ED_uvedit_ensure_uvs(Object *obedit)
return 1;
}
Mesh *mesh = static_cast<Mesh *>(obedit->data);
BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMIter iter;
@ -116,7 +117,7 @@ static bool ED_uvedit_ensure_uvs(Object *obedit)
return 0;
}
const char *active_uv_name = CustomData_get_active_layer_name(&em->bm->ldata, CD_PROP_FLOAT2);
const char *active_uv_name = mesh->active_uv_attribute;
BM_uv_map_ensure_vert_select_attr(em->bm, active_uv_name);
BM_uv_map_ensure_edge_select_attr(em->bm, active_uv_name);
const BMUVOffsets offsets = BM_uv_map_get_offsets(em->bm);
@ -2015,7 +2016,9 @@ static void shrink_loop_uv_by_aspect_ratio(BMFace *efa,
static void correct_uv_aspect(Object *ob, BMEditMesh *em)
{
const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_PROP_FLOAT2);
Mesh *mesh = static_cast<Mesh *>(ob->data);
const int cd_loop_uv_offset = CustomData_get_offset_named(
&em->bm->ldata, CD_PROP_FLOAT2, mesh->active_uv_attribute);
const float aspect_y = ED_uvedit_get_aspect_y(ob);
if (aspect_y == 1.0f) {
/* Scaling by 1.0 has no effect. */
@ -2041,7 +2044,9 @@ static void correct_uv_aspect_per_face(Object *ob, BMEditMesh *em)
blender::Array<float, 16> material_aspect_y(materials_num, -1);
/* Lazily initialize aspect ratio for materials. */
const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_PROP_FLOAT2);
Mesh *mesh = static_cast<Mesh *>(ob->data);
const int cd_loop_uv_offset = CustomData_get_offset_named(
&em->bm->ldata, CD_PROP_FLOAT2, mesh->active_uv_attribute);
BMFace *efa;
BMIter iter;
@ -2971,7 +2976,9 @@ static int uv_from_view_exec(bContext *C, wmOperator *op)
continue;
}
const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_PROP_FLOAT2);
Mesh *mesh = static_cast<Mesh *>(obedit->data);
const int cd_loop_uv_offset = CustomData_get_offset_named(
&em->bm->ldata, CD_PROP_FLOAT2, mesh->active_uv_attribute);
if (use_orthographic) {
uv_map_rotation_matrix_ex(rotmat, rv3d, obedit, 90.0f, 0.0f, 1.0f, objects_pos_offset);