From e97aed1e73e72174e08dc1ea152725007647a6cc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Mar 2020 15:07:57 +1100 Subject: Cleanup: remove unused 'eInsertKeyFlags' from delete API call There is no need for an insertion flag in a delete function. --- source/blender/editors/animation/keyframing.c | 5 ++--- source/blender/editors/animation/keyingsets.c | 2 +- source/blender/editors/include/ED_keyframing.h | 3 +-- source/blender/python/intern/bpy_rna_anim.c | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index b48b96830d2..c8ef4fe2965 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1576,8 +1576,7 @@ short delete_keyframe(Main *bmain, bAction *act, const char rna_path[], int array_index, - float cfra, - eInsertKeyFlags UNUSED(flag)) + float cfra) { AnimData *adt = BKE_animdata_from_id(id); PointerRNA id_ptr, ptr; @@ -2589,7 +2588,7 @@ static int delete_key_button_exec(bContext *C, wmOperator *op) index = -1; } - success = delete_keyframe(bmain, op->reports, ptr.owner_id, NULL, path, index, cfra, 0); + success = delete_keyframe(bmain, op->reports, ptr.owner_id, NULL, path, index, cfra); MEM_freeN(path); } else if (G.debug & G_DEBUG) { diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index d30828f824d..6b33c100a8f 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -1136,7 +1136,7 @@ int ANIM_apply_keyingset( kflag2); } else if (mode == MODIFYKEY_MODE_DELETE) { - success += delete_keyframe(bmain, reports, ksp->id, act, ksp->rna_path, i, cfra, kflag2); + success += delete_keyframe(bmain, reports, ksp->id, act, ksp->rna_path, i, cfra); } } diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index e4d86a026e3..7baaaf63d6a 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -150,8 +150,7 @@ short delete_keyframe(struct Main *bmain, struct bAction *act, const char rna_path[], int array_index, - float cfra, - eInsertKeyFlags flag); + float cfra); /* ************ Keying Sets ********************** */ diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index b9cdcc94260..0533e8cc499 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/source/blender/python/intern/bpy_rna_anim.c @@ -501,8 +501,7 @@ PyObject *pyrna_struct_keyframe_delete(BPy_StructRNA *self, PyObject *args, PyOb BKE_reports_init(&reports, RPT_STORE); - result = delete_keyframe( - G.main, &reports, (ID *)self->ptr.owner_id, NULL, path_full, index, cfra, 0); + result = delete_keyframe(G.main, &reports, self->ptr.owner_id, NULL, path_full, index, cfra); MEM_freeN((void *)path_full); if (BPy_reports_to_error(&reports, PyExc_RuntimeError, true) == -1) { -- cgit v1.2.3