diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-15 08:08:57 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-15 08:08:57 +0400 |
commit | 7081abf51f071877c5015c830af64bcfaa1becc7 (patch) | |
tree | d14f3f11a96eca479364f78fde8aef05f010d343 /source/blender/blenkernel | |
parent | d772b51b56dbe59956cd11c598a876889d09b212 (diff) |
Remove unused parameter from multires_dm_create_from_derived.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_multires.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index 1816943f32a..6c8d20eed30 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -57,7 +57,7 @@ void multires_modifier_update_hidden(struct DerivedMesh *dm); void multiresModifier_set_levels_from_disps(struct MultiresModifierData *mmd, struct Object *ob); struct DerivedMesh *multires_dm_create_from_derived(struct MultiresModifierData*, - int local_mmd, struct DerivedMesh*, struct Object *, int, int); + int local_mmd, struct DerivedMesh*, struct Object *, int); struct MultiresModifierData *find_multires_modifier_before(struct Scene *scene, struct ModifierData *lastmd); diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index d0900b50f0a..a363d7ad72b 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -658,7 +658,7 @@ static DerivedMesh *multires_dm_create_local(Object *ob, DerivedMesh *dm, int lv mmd.totlvl = totlvl; mmd.simple = simple; - return multires_dm_create_from_derived(&mmd, 1, dm, ob, 0, 0); + return multires_dm_create_from_derived(&mmd, 1, dm, ob, 0); } static DerivedMesh *subsurf_dm_create_local(Object *ob, DerivedMesh *dm, int lvl, int simple, int optimal, int plain_uv) @@ -1304,8 +1304,9 @@ void multires_stitch_grids(Object *ob) } } -DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, int local_mmd, DerivedMesh *dm, Object *ob, - int useRenderParams, int UNUSED(isFinalCalc)) +DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, + int local_mmd, DerivedMesh *dm, + Object *ob, int useRenderParams) { Mesh *me= ob->data; DerivedMesh *result; @@ -1970,7 +1971,7 @@ void multires_load_old(Object *ob, Mesh *me) mmd->lvl = mmd->totlvl; orig = CDDM_from_mesh(me, NULL); - dm = multires_dm_create_from_derived(mmd, 0, orig, ob, 0, 0); + dm = multires_dm_create_from_derived(mmd, 0, orig, ob, 0); multires_load_old_dm(dm, me, mmd->totlvl+1); |