Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesdna / DNA_modifier_types.h
index 72e453b7e2325bf8e4a94f4abdb7a5a11c3fddbe..283e801ea7a571a0cd73d8d7489771b55a5d401d 100644 (file)
@@ -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),