archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Cleanup: Keyframing, remove duplicate code

Browse Source 
Remove duplicate code from the `ANIM_OT_keyframe_delete` operator. The
actions of the removed code are already performed by the preceding
`keyingset_get_from_op_with_error()` call.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2021-07-06 17:49:12 +02:00
parent e2c4a4c510
commit 563ef943c7
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/editors/animation/keyframing.c
View File

@@ -2087,29 +2087,6 @@ static int delete_key_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
const int prop_type = RNA_property_type(op->type->prop);
if (prop_type == PROP_ENUM) {
int type = RNA_property_enum_get(op->ptr, op->type->prop);
ks = ANIM_keyingset_get_from_enum_type(scene, type);
if (ks == NULL) {
BKE_report(op->reports, RPT_ERROR, "No active Keying Set");
return OPERATOR_CANCELLED;
}
}
else if (prop_type == PROP_STRING) {
char type_id[MAX_ID_NAME - 2];
RNA_property_string_get(op->ptr, op->type->prop, type_id);
ks = ANIM_keyingset_get_from_idname(scene, type_id);
if (ks == NULL) {
BKE_reportf(op->reports, RPT_ERROR, "Active Keying Set '%s' not found", type_id);
return OPERATOR_CANCELLED;
}
}
else {
BLI_assert(0);
}
/* report failure */
if (ks == NULL) {
BKE_report(op->reports, RPT_ERROR, "No active Keying Set");