diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2021-04-29 20:17:22 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2021-04-29 20:17:22 +0300 |
| commit | f70a8c158118b422d4937d3e028b049d5efe9148 (patch) | |
| tree | 6b6e20139565f50713c3ef69b7ee16f329b1de50 /source/blender/modifiers/intern/MOD_boolean.cc | |
| parent | 8eeacca9cbc1e82b8cd869ae43e44fec2d4492c9 (diff) | |
| parent | 9291128bff9aafcf7ddc5765e9c89c9655e21c4b (diff) | |
Merge branch 'master' into temp_bmesh_multires
Also fixed a pose brush bug that may or may not have been
the result of the merge nixing code, need to check master.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.cc')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 88ad6780037..9039ca57dab 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -124,13 +124,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte Collection *col = bmd->collection; if ((bmd->flag & eBooleanModifierFlag_Collection) && col != nullptr) { - FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN (col, operand_ob) { - if (operand_ob->type == OB_MESH && operand_ob != ctx->object) { - DEG_add_object_relation(ctx->node, operand_ob, DEG_OB_COMP_TRANSFORM, "Boolean Modifier"); - DEG_add_object_relation(ctx->node, operand_ob, DEG_OB_COMP_GEOMETRY, "Boolean Modifier"); - } - } - FOREACH_COLLECTION_OBJECT_RECURSIVE_END; + DEG_add_collection_geometry_relation(ctx->node, col, "Boolean Modifier"); } /* We need own transformation as well. */ DEG_add_modifier_to_transform_relation(ctx->node, "Boolean Modifier"); @@ -641,7 +635,6 @@ ModifierTypeInfo modifierType_Boolean = { /* modifyMesh */ modifyMesh, /* modifyHair */ nullptr, /* modifyGeometrySet */ nullptr, - /* modifyVolume */ nullptr, /* initData */ initData, /* requiredDataMask */ requiredDataMask, |