diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-12-17 23:13:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-12-17 23:13:54 +0300 |
| commit | 8b28c24d16386db7e68326d8607de5d20c9833b0 (patch) | |
| tree | 70176cdad245118b54e1aa4ebeee98cdc84f6cbf /source/blender/modifiers/intern/MOD_shrinkwrap.c | |
| parent | 4b0c455093202ff203b7ea751786c39afcdc5633 (diff) | |
Fix #25272: shrinkwrap with dependency cycle could lead to eternal
loop and increasing memory usage.
Modifiers should never call mesh_get_derived_final or similar, only
use ob->derivedFinal if it exists, if the dependencies are set correct
and there are no cycles, it will be there.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_shrinkwrap.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_shrinkwrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index 417c73eba98..ff0ed5d841a 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -117,7 +117,7 @@ static void deformVerts(ModifierData *md, Object *ob, if(dataMask) dm= get_cddm(ob, NULL, dm, vertexCos); - shrinkwrapModifier_deform((ShrinkwrapModifierData*)md, md->scene, ob, dm, vertexCos, numVerts); + shrinkwrapModifier_deform((ShrinkwrapModifierData*)md, ob, dm, vertexCos, numVerts); if(dm != derivedData) dm->release(dm); @@ -132,7 +132,7 @@ static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh *editDat if(dataMask) dm= get_cddm(ob, editData, dm, vertexCos); - shrinkwrapModifier_deform((ShrinkwrapModifierData*)md, md->scene, ob, dm, vertexCos, numVerts); + shrinkwrapModifier_deform((ShrinkwrapModifierData*)md, ob, dm, vertexCos, numVerts); if(dm != derivedData) dm->release(dm); |