diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-06-07 23:16:56 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-06-07 23:16:56 +0400 |
commit | d9690e92957beefb8c233313a040e54e06486b30 (patch) | |
tree | afbe0d0cbdf8e4f0490cb7c029e2335abe553c4d /source/blender | |
parent | 52caf71ee2febf9c697fe66ce36fb9a9597c9a44 (diff) |
Reverting commit 21540, incorrect bugfix.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 24615906e19..505fcdc43d5 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -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); diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index c23dcc5ce0a..116f5ab22d2 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -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) |