From 698f1b56037ea9c6eec170a0f3b74b7a46eaae1d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 12 May 2013 09:14:07 +0000 Subject: Fix #35317: crash with boolean modifier using an object whose library linked mesh datablock went missing. --- source/blender/modifiers/intern/MOD_boolean.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/modifiers/intern/MOD_boolean.c') 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 { -- cgit v1.2.3