diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-12 13:14:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-12 13:14:07 +0400 |
| commit | 698f1b56037ea9c6eec170a0f3b74b7a46eaae1d (patch) | |
| tree | 53c93803e3313d17105ec2546ea4340f335c6df8 /source/blender/modifiers/intern/MOD_boolean.c | |
| parent | cf96fdfc65b069528171cee1cdd893f364ff4b7f (diff) | |
Fix #35317: crash with boolean modifier using an object whose library linked
mesh datablock went missing.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 04198d9feb9..2be2f350a73 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -136,7 +136,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, * in other scenes when compositing */ if (bmd->object != ob) { /* weak! - but we can too easy end up with circular dep crash otherwise */ - if (modifiers_findByType(bmd->object, eModifierType_Boolean) == NULL) { + if (bmd->object->type == OB_MESH && modifiers_findByType(bmd->object, eModifierType_Boolean) == NULL) { dm = mesh_get_derived_final(md->scene, bmd->object, CD_MASK_MESH); } else { |