diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-12-11 12:24:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-11 12:24:39 +0300 |
commit | 8cd7b428774fedf16cd6164b60615666045fb1fc (patch) | |
tree | 969fee690c618bcd597826e2244d5d36917c1aba /source/blender/makesdna/DNA_modifier_types.h | |
parent | 8ae8b62a0ed148863e8b64480a0c15f1d068fbf5 (diff) |
BMesh: Add option to use BMesh boolean modifier
This uses a bmesh-intersection, BLI_kdtree and watertight intersections to perform boolean operations.
For now keep both BMesh and Carve booleans usable at once for testing & bug reports,
however we plan to phase out Carve by next release.
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 6f07d18953e..525e267e537 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -640,7 +640,9 @@ typedef struct BooleanModifierData { ModifierData modifier; struct Object *object; - int operation, pad; + char operation; + char bm_flag, pad[2]; + float threshold; } BooleanModifierData; typedef enum { @@ -649,6 +651,14 @@ typedef enum { eBooleanModifierOp_Difference = 2, } BooleanModifierOp; +/* temp bm_flag (debugging only) */ +enum { + eBooleanModifierBMeshFlag_Enabled = (1 << 0), + eBooleanModifierBMeshFlag_BMesh_Separate = (1 << 1), + eBooleanModifierBMeshFlag_BMesh_NoDissolve = (1 << 2), + eBooleanModifierBMeshFlag_BMesh_NoConnectRegions = (1 << 3), +}; + typedef struct MDefInfluence { int vertex; float weight; |