griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-11-10 14:50:02 +11:00
parent f67ea33993 9b3108462f
commit 86c5c4af6e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2737,8 +2737,7 @@ void ED_uvedit_live_unwrap(const Scene *scene, const Span<Object *> objects)
options.topology_from_uvs = false;
options.only_selected_faces = false;
options.only_selected_uvs = false;
options.fill_holes = (scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES) != 0;
options.correct_aspect = (scene->toolsettings->uvcalc_flag & UVCALC_NO_ASPECT_CORRECT) == 0;
uvedit_unwrap_multi(scene, objects, &options, nullptr);
blender::geometry::UVPackIsland_Params pack_island_params;
@@ -2772,8 +2771,6 @@ static int unwrap_exec(bContext *C, wmOperator *op)
options.topology_from_uvs = false;
options.only_selected_faces = true;
options.only_selected_uvs = false;
options.fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
options.correct_aspect = RNA_boolean_get(op->ptr, "correct_aspect");
/* We will report an error unless at least one object
* has the subsurf modifier in the right place. */