diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-08 18:27:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-08 18:27:28 +0300 |
| commit | 92786141159430fa36e59e0229e4bbb84f2f04be (patch) | |
| tree | dd93e8f2a611ecbbc05646533798e97354d0f34e /source/blender/makesdna/DNA_modifier_types.h | |
| parent | bdc708762cf0fe0490bee3cf8452446da46d342a (diff) | |
| parent | e0597baed57fa7a9dfaf6dff6d0fa120784d21ea (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 72e453b7e23..283e801ea7a 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -655,8 +655,7 @@ typedef struct BooleanModifierData { struct Object *object; char operation; - char solver; - char pad; + char pad[2]; char bm_flag; float double_threshold; } BooleanModifierData; @@ -667,11 +666,6 @@ typedef enum { eBooleanModifierOp_Difference = 2, } BooleanModifierOp; -typedef enum { - eBooleanModifierSolver_Carve = 0, - eBooleanModifierSolver_BMesh = 1, -} BooleanSolver; - /* bm_flag (only used when G_DEBUG) */ enum { eBooleanModifierBMeshFlag_BMesh_Separate = (1 << 0), |