Merge branch 'blender-v3.0-release'

This commit is contained in:
Brecht Van Lommel 2021-11-27 21:59:57 +01:00
commit e121b5b66c
1 changed files with 6 additions and 3 deletions

View File

@ -1370,6 +1370,11 @@ static bool is_pwn(const IMesh &tm, const TriMeshTopology &tmtopo)
}
threading::parallel_for(tris.index_range(), 2048, [&](IndexRange range) {
if (!is_pwn.load()) {
/* Early out if mesh is already determined to be non-pwn. */
return;
}
for (int j : range) {
const Edge &edge = tris[j].first;
int tot_orient = 0;
@ -1395,9 +1400,7 @@ static bool is_pwn(const IMesh &tm, const TriMeshTopology &tmtopo)
std::cout << "edge causing non-pwn: " << edge << "\n";
}
is_pwn = false;
# ifdef WITH_TBB
tbb::task::self().cancel_group_execution();
# endif
break;
}
}
});