Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +12 -14
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7896ebec12 - Show all commits

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

@ -1290,14 +1290,13 @@ static bool island_has_pins(const Scene *scene,
* This is needed to perform UV packing on objects that aren't in edit-mode. * This is needed to perform UV packing on objects that aren't in edit-mode.
* \param udim_params: Parameters to specify UDIM target and UDIM source image. * \param udim_params: Parameters to specify UDIM target and UDIM source image.
* \param params: Parameters and options to pass to the packing engine. * \param params: Parameters and options to pass to the packing engine.
*
*/ */
void ED_uvedit_pack_islands_multi(const Scene *scene, static void uvedit_pack_islands_multi(const Scene *scene,
Object **objects, Object **objects,
const int objects_len, const int objects_len,
BMesh **bmesh_override, BMesh **bmesh_override,
const UVMapUDIM_Params *closest_udim, const UVMapUDIM_Params *closest_udim,
const UVPackIsland_Params *params) const UVPackIsland_Params *params)
{ {
blender::Vector<FaceIsland *> island_vector; blender::Vector<FaceIsland *> island_vector;
@ -1533,7 +1532,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op)
closest_udim->grid_shape[1] = sima->tile_grid_shape[1]; closest_udim->grid_shape[1] = sima->tile_grid_shape[1];
} }
ED_uvedit_pack_islands_multi( uvedit_pack_islands_multi(
scene, objects, objects_len, nullptr, closest_udim, &pack_island_params); scene, objects, objects_len, nullptr, closest_udim, &pack_island_params);
MEM_freeN(objects); MEM_freeN(objects);
@ -2308,8 +2307,7 @@ void ED_uvedit_live_unwrap(const Scene *scene, Object **objects, int objects_len
pack_island_params.margin_method = ED_UVPACK_MARGIN_SCALED; pack_island_params.margin_method = ED_UVPACK_MARGIN_SCALED;
pack_island_params.margin = scene->toolsettings->uvcalc_margin; pack_island_params.margin = scene->toolsettings->uvcalc_margin;
ED_uvedit_pack_islands_multi( uvedit_pack_islands_multi(scene, objects, objects_len, nullptr, nullptr, &pack_island_params);
scene, objects, objects_len, nullptr, nullptr, &pack_island_params);
} }
} }
@ -2461,7 +2459,7 @@ static int unwrap_exec(bContext *C, wmOperator *op)
RNA_enum_get(op->ptr, "margin_method")); RNA_enum_get(op->ptr, "margin_method"));
pack_island_params.margin = RNA_float_get(op->ptr, "margin"); pack_island_params.margin = RNA_float_get(op->ptr, "margin");
ED_uvedit_pack_islands_multi(scene, objects, objects_len, nullptr, nullptr, &pack_island_params); uvedit_pack_islands_multi(scene, objects, objects_len, nullptr, nullptr, &pack_island_params);
MEM_freeN(objects); MEM_freeN(objects);
@ -2841,10 +2839,10 @@ static int smart_project_exec(bContext *C, wmOperator *op)
params.margin_method = eUVPackIsland_MarginMethod(RNA_enum_get(op->ptr, "margin_method")); params.margin_method = eUVPackIsland_MarginMethod(RNA_enum_get(op->ptr, "margin_method"));
params.margin = RNA_float_get(op->ptr, "island_margin"); params.margin = RNA_float_get(op->ptr, "island_margin");
ED_uvedit_pack_islands_multi( uvedit_pack_islands_multi(
scene, objects_changed, object_changed_len, nullptr, nullptr, &params); scene, objects_changed, object_changed_len, nullptr, nullptr, &params);
/* #ED_uvedit_pack_islands_multi only supports `per_face_aspect = false`. */ /* #uvedit_pack_islands_multi only supports `per_face_aspect = false`. */
const bool per_face_aspect = false; const bool per_face_aspect = false;
uv_map_clip_correct( uv_map_clip_correct(
scene, objects_changed, object_changed_len, op, per_face_aspect, only_selected_uvs); scene, objects_changed, object_changed_len, op, per_face_aspect, only_selected_uvs);
@ -3831,7 +3829,7 @@ void ED_uvedit_add_simple_uvs(Main *bmain, const Scene *scene, Object *ob)
params.margin_method = ED_UVPACK_MARGIN_SCALED; params.margin_method = ED_UVPACK_MARGIN_SCALED;
params.margin = 0.001f; params.margin = 0.001f;
ED_uvedit_pack_islands_multi(scene, &ob, 1, &bm, nullptr, &params); uvedit_pack_islands_multi(scene, &ob, 1, &bm, nullptr, &params);
/* Write back from BMesh to Mesh. */ /* Write back from BMesh to Mesh. */
BMeshToMeshParams bm_to_me_params{}; BMeshToMeshParams bm_to_me_params{};