From 640fb84bed74e5b63e3e3186a4239cccd021cb05 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 6 Jun 2010 15:22:27 +0000 Subject: - Added checking if modifier is active in find_multires_modifier - Pass MultiresModifierData to reshape functions --- source/blender/blenkernel/BKE_multires.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel/BKE_multires.h') diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index 8716794bbd4..e8bbb58a895 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -47,15 +47,19 @@ void multires_force_external_reload(struct Object *ob); struct DerivedMesh *multires_dm_create_from_derived(struct MultiresModifierData*, int local_mmd, struct DerivedMesh*, struct Object *, int, int); -struct MultiresModifierData *find_multires_modifier(struct Object *ob); -struct DerivedMesh *get_multires_dm(struct Object *ob); +struct MultiresModifierData *find_multires_modifier(struct Scene *scene, struct Object *ob); +struct DerivedMesh *get_multires_dm(struct Scene *scene, struct MultiresModifierData *mmd, + struct Object *ob); void multiresModifier_join(struct Object *); void multiresModifier_del_levels(struct MultiresModifierData *, struct Object *, int direction); void multiresModifier_subdivide(struct MultiresModifierData *mmd, struct Object *ob, int updateblock, int simple); -int multiresModifier_reshape(struct Object *dst, struct Object *src); -int multiresModifier_reshapeFromDM(struct Object *ob, struct DerivedMesh *srcdm); -int multiresModifier_reshapeFromDeformMod(struct Object *ob, struct ModifierData *md); +int multiresModifier_reshape(struct Scene *scene, struct MultiresModifierData *mmd, + struct Object *dst, struct Object *src); +int multiresModifier_reshapeFromDM(struct Scene *scene, struct MultiresModifierData *mmd, + struct Object *ob, struct DerivedMesh *srcdm); +int multiresModifier_reshapeFromDeformMod(struct Scene *scene, struct MultiresModifierData *mmd, + struct Object *ob, struct ModifierData *md); void multires_stitch_grids(struct Object *); -- cgit v1.2.3