blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Fix #108171: crash calling bpy.ops.uv.pack_islands #108185

Merged
Philipp Oeser merged 2 commits from lichtwerk/blender:108171 into blender-v3.6-release 2023-05-24 11:57:28 +02:00
Conversation 3 Commits 2 Files Changed 1 +10 -3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1412,7 +1412,9 @@ struct UVPackIslandsData {
static void pack_islands_startjob(void *pidv, bool *stop, bool *do_update, float *progress)
{
*progress = 0.02f;
if (progress != nullptr) {
*progress = 0.02f;
}
UVPackIslandsData *pid = static_cast<UVPackIslandsData *>(pidv);
@ -1429,8 +1431,12 @@ static void pack_islands_startjob(void *pidv, bool *stop, bool *do_update, float
!pid->use_job,
&pid->pack_island_params);
*progress = 0.99f;
*do_update = true;
if (progress != nullptr) {
*progress = 0.99f;
}
if (do_update != nullptr) {
*do_update = true;
}
}
static void pack_islands_endjob(void *pidv)
@ -1544,6 +1550,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op)
pack_islands_startjob(pid, nullptr, nullptr, nullptr);
pack_islands_endjob(pid);
pack_islands_freejob(pid);
MEM_freeN(pid);
return OPERATOR_FINISHED;