diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-22 16:45:19 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-22 17:07:57 +0300 |
| commit | 9dd279cbdf93b21598267f1860257f0f81837732 (patch) | |
| tree | 7a1882743bfce6a474819f9c9f2e820f8553b08e /source | |
| parent | dade2b7548713d71a9d907c4aafab17e3c2d5fc6 (diff) | |
Multires: Remove unused function argument
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_multires.h | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/multires_reshape.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index d94e3f263eb..5d23f1da289 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -119,8 +119,10 @@ int mdisp_rot_face_to_crn(struct MVert *mvert, struct MPoly *mpoly, struct MLoop bool multiresModifier_reshape(struct Depsgraph *depsgraph, struct Scene *scene, struct MultiresModifierData *mmd, struct Object *dst, struct Object *src); bool multiresModifier_reshapeFromDeformModifier( - struct Depsgraph *depsgraph, struct Scene *scene, struct MultiresModifierData *mmd, - struct Object *ob, struct ModifierData *md); + struct Depsgraph *depsgraph, + struct MultiresModifierData *mmd, + struct Object *ob, + struct ModifierData *md); /* Subdivision integration, defined in multires_subdiv.c */ diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index 7aad7592896..b7f53365334 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -430,7 +430,6 @@ bool multiresModifier_reshape( bool multiresModifier_reshapeFromDeformModifier( struct Depsgraph *depsgraph, - Scene *UNUSED(scene), MultiresModifierData *mmd, Object *object, ModifierData *md) diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 93bc59fd852..7137583f636 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -605,7 +605,7 @@ static int modifier_apply_obdata(ReportList *reports, Depsgraph *depsgraph, Scen multires_force_update(ob); if (mmd && mmd->totlvl && mti->type == eModifierTypeType_OnlyDeform) { - if (!multiresModifier_reshapeFromDeformModifier(depsgraph, scene, mmd, ob, md)) { + if (!multiresModifier_reshapeFromDeformModifier(depsgraph, mmd, ob, md)) { BKE_report(reports, RPT_ERROR, "Multires modifier returned error, skipping apply"); return 0; } |