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 +7 -18
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d474732f91 - Show all commits

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

@ -195,11 +195,6 @@ struct UnwrapOptions {
bool pin_unselected; bool pin_unselected;
}; };
struct UnwrapResultInfo {
int count_changed;
int count_failed;
};
static bool uvedit_have_selection(const Scene *scene, BMEditMesh *em, const UnwrapOptions *options) static bool uvedit_have_selection(const Scene *scene, BMEditMesh *em, const UnwrapOptions *options)
{ {
BMFace *efa; BMFace *efa;
@ -2438,15 +2433,9 @@ static int unwrap_exec(bContext *C, wmOperator *op)
} }
/* execute unwrap */ /* execute unwrap */
UnwrapResultInfo result_info{}; int count_changed = 0;
result_info.count_changed = 0; int count_failed = 0;
result_info.count_failed = 0; uvedit_unwrap_multi(scene, objects, objects_len, &options, &count_changed, &count_failed);
uvedit_unwrap_multi(scene,
objects,
objects_len,
&options,
&result_info.count_changed,
&result_info.count_failed);
UVPackIsland_Params pack_island_params{}; UVPackIsland_Params pack_island_params{};
pack_island_params.rotate = true; pack_island_params.rotate = true;
@ -2464,17 +2453,17 @@ static int unwrap_exec(bContext *C, wmOperator *op)
MEM_freeN(objects); MEM_freeN(objects);
if (result_info.count_failed == 0 && result_info.count_changed == 0) { if (count_failed == 0 && count_changed == 0) {
BKE_report(op->reports, BKE_report(op->reports,
RPT_WARNING, RPT_WARNING,
"Unwrap could not solve any island(s), edge seams may need to be added"); "Unwrap could not solve any island(s), edge seams may need to be added");
} }
else if (result_info.count_failed) { else if (count_failed) {
BKE_reportf(op->reports, BKE_reportf(op->reports,
RPT_WARNING, RPT_WARNING,
"Unwrap failed to solve %d of %d island(s), edge seams may need to be added", "Unwrap failed to solve %d of %d island(s), edge seams may need to be added",
result_info.count_failed, count_failed,
result_info.count_changed + result_info.count_failed); count_changed + count_failed);
} }
return OPERATOR_FINISHED; return OPERATOR_FINISHED;