sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix part of #20090: boolean modifier would lose link to object

Browse Source 
if evaluation failed, it should display an error message instead.
This commit is contained in:
Brecht Van Lommel 2010-01-27 14:13:01 +00:00
parent c070841acd
commit aefdec6ae2
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/modifier.c
View File

@ -6577,7 +6577,6 @@ static DerivedMesh *booleanModifier_applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
int useRenderParams, int isFinalCalc)
{
// XXX doesn't handle derived data
BooleanModifierData *bmd = (BooleanModifierData*) md;
DerivedMesh *dm = bmd->object->derivedFinal;
@ -6587,20 +6586,14 @@ static DerivedMesh *booleanModifier_applyModifier(
DerivedMesh *result = NewBooleanDerivedMesh(dm, bmd->object, derivedData, ob,
1 + bmd->operation);
if(dm)
dm->release(dm);
/* if new mesh returned, return it; otherwise there was
* an error, so delete the modifier object */
if(result)
return result;
else
bmd->object = NULL;
modifier_setError(md, "Can't execute boolean operation.");
}
if(dm)
dm->release(dm);
return derivedData;
}