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/blenkernel/BKE_shrinkwrap.h | |
| 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/blenkernel/BKE_shrinkwrap.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_shrinkwrap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index 47fb5049278..6b8e7860db8 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -35,7 +35,7 @@ #include "BKE_customdata.h" struct DerivedMesh; struct Object; -struct DerivedMesh *object_get_derived_final(struct Scene *scene, struct Object *ob, CustomDataMask dataMask); +struct DerivedMesh *object_get_derived_final(struct Object *ob); /* SpaceTransform stuff */ @@ -121,7 +121,7 @@ typedef struct ShrinkwrapCalcData } ShrinkwrapCalcData; -void shrinkwrapModifier_deform(struct ShrinkwrapModifierData *smd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts); +void shrinkwrapModifier_deform(struct ShrinkwrapModifierData *smd, struct Object *ob, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts); /* * This function casts a ray in the given BVHTree.. but it takes into consideration the space_transform, that is: |