forked from bartvdbraak/blender
Reverting commit 21540, incorrect bugfix.
This commit is contained in:
parent
52caf71ee2
commit
d9690e9295
@ -211,9 +211,9 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
|
||||
|
||||
/* need to avoid infinite recursion here */
|
||||
if(amd->start_cap && amd->start_cap != ob)
|
||||
start_cap = mesh_get_derived_final(scene, amd->start_cap, 0);
|
||||
start_cap = amd->start_cap->derivedFinal;
|
||||
if(amd->end_cap && amd->end_cap != ob)
|
||||
end_cap = mesh_get_derived_final(scene, amd->end_cap, 0);
|
||||
end_cap = amd->end_cap->derivedFinal;
|
||||
|
||||
unit_m4(offset);
|
||||
|
||||
|
@ -85,7 +85,7 @@ static DerivedMesh *applyModifier(
|
||||
int useRenderParams, int isFinalCalc)
|
||||
{
|
||||
BooleanModifierData *bmd = (BooleanModifierData*) md;
|
||||
DerivedMesh *dm = mesh_get_derived_final(md->scene, bmd->object, 0);
|
||||
DerivedMesh *dm = bmd->object->derivedFinal;
|
||||
|
||||
/* we do a quick sanity check */
|
||||
if(dm && (derivedData->getNumFaces(derivedData) > 3)
|
||||
|
Loading…
Reference in New Issue
Block a user