diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2020-08-28 17:56:44 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2020-08-28 18:01:06 +0300 |
| commit | 9e09b5c418c0a436e3c84ccf38c065527988b0a0 (patch) | |
| tree | c0e81b8834aaf27c22a2734e364452fa2af5c6c1 /source/blender/makesdna | |
| parent | 4a17508c6d2a24dfb7c018ae49c80f12b4d3e610 (diff) | |
Merge newboolean branch into master.
This is for design task T67744, Boolean Redesign.
It adds a choice of solver to the Boolean modifier and the
Intersect (Boolean) and Intersect (Knife) tools.
The 'Fast' choice is the current Bmesh boolean.
The new 'Exact' choice is a more advanced algorithm that supports
overlapping geometry and uses more robust calculations, but is
slower than the Fast choice.
The default with this commit is set to 'Exact'. We can decide before
the 2.91 release whether or not this is the right choice, but this
choice now will get us more testing and feedback on the new code.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index b92c9f42a73..2839d826df9 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -862,7 +862,8 @@ typedef struct BooleanModifierData { struct Object *object; char operation; - char _pad[2]; + char solver; + char _pad[1]; char bm_flag; float double_threshold; } BooleanModifierData; @@ -873,7 +874,12 @@ typedef enum { eBooleanModifierOp_Difference = 2, } BooleanModifierOp; -/* bm_flag (only used when G_DEBUG) */ +typedef enum { + eBooleanModifierSolver_Fast = 0, + eBooleanModifierSolver_Exact = 1, +} BooleanModifierSolver; + +/* bm_flag only used when G_DEBUG. */ enum { eBooleanModifierBMeshFlag_BMesh_Separate = (1 << 0), eBooleanModifierBMeshFlag_BMesh_NoDissolve = (1 << 1), |