diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-11-27 23:59:57 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-27 23:59:57 +0300 |
commit | e121b5b66c861cc4d45e06ba2967ffb701f72ce4 (patch) | |
tree | 359a09239754839dfa849f79c98dd184a6693c4a /source/blender/blenlib/intern | |
parent | aa6c922d99f7ae170f652ffd87dc852afda0af76 (diff) | |
parent | d2e608733507add9ecc77c122d9f542a80adccbf (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/mesh_boolean.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index 8b029d11c3f..20b696bb56f 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -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; } } }); |