diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-04-19 22:18:52 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-04-19 22:18:52 +0400 |
| commit | b36514a3be32f0d3a5f85557be54e7060c9099da (patch) | |
| tree | b2562082e0aa4c75e706f3f560203700337d1bb2 | |
| parent | 904483c96c6adb5dc7976e676d8bb393232eed14 (diff) | |
Booleans:
- Enable e.g. subsurf before boolean modifier
- Fix editmode crash
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 65bbbdfbcfb..7977e7b0160 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -6143,7 +6143,7 @@ static DerivedMesh *booleanModifier_applyModifier( DerivedMesh *dm = mesh_get_derived_final(bmd->object, CD_MASK_BAREMESH); /* we do a quick sanity check */ - if(derivedData->getNumFaces(derivedData) > 3 + if(dm && (derivedData->getNumFaces(derivedData) > 3) && bmd->object && dm->getNumFaces(dm) > 3) { DerivedMesh *result = NewBooleanDerivedMesh(dm, bmd->object, derivedData, ob, 1 + bmd->operation); @@ -8326,7 +8326,6 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type) mti = INIT_TYPE(Boolean); mti->type = eModifierTypeType_Nonconstructive; mti->flags = eModifierTypeFlag_AcceptsMesh - | eModifierTypeFlag_RequiresOriginalData | eModifierTypeFlag_UsesPointCache; mti->copyData = booleanModifier_copyData; mti->isDisabled = booleanModifier_isDisabled; |