diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2020-11-08 16:39:01 +0300 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2020-11-08 18:12:53 +0300 |
commit | 39012146e142bf400c7140d90ecfd27c45b589ca (patch) | |
tree | 2671e7fbc63c485fe15bb91737e2380326b27a2c /source/blender/blenlib/intern/mesh_boolean.cc | |
parent | 7be47dadea5066ae095c644e0b4f1f10d75f5ab3 (diff) |
Fix T81651, exact boolean modifier incorrect if operand hidden.
The code was trying to ignore hidden geometry when doing boolean,
which is correct when used as a tool, but not when a modifier.
Added a "keep_hidden" argument to bmesh_boolean to distinguish the
two cases.
Also fixed a bug when the tool is used with hidden geometry that
is attached to unhidden geometry that is deleted by the operation.
Diffstat (limited to 'source/blender/blenlib/intern/mesh_boolean.cc')
-rw-r--r-- | source/blender/blenlib/intern/mesh_boolean.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index c85adf835fe..4ff5afdb05f 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -428,7 +428,9 @@ class Cell { BoolOpType bool_optype) { std::copy(from_cell.winding().begin(), from_cell.winding().end(), winding_.begin()); - winding_[shape] += delta; + if (shape >= 0) { + winding_[shape] += delta; + } winding_assigned_ = true; in_output_volume_ = apply_bool_op(bool_optype, winding_); } |