Merge branch 'master' into blender28

2018-06-15 15:42:42 +02:00
parent 8166d0affd b84fad2ba3
commit 0b8c2eed75
10 changed files with 46 additions and 36 deletions
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -310,6 +310,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 				        use_dissolve,
 				        use_island_connect,
 				        false,
+				        false,
 				        bmd->operation,
 				        bmd->double_threshold);