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

Reverting commit 21540, incorrect bugfix.

Browse Source
This commit is contained in:
Nicholas Bishop 2010-06-07 19:16:56 +00:00
parent 52caf71ee2
commit d9690e9295
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_array.c
View File

@ -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);

2
source/blender/modifiers/intern/MOD_boolean.c
View File

@ -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)