Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-03-06 13:36:37 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-03-06 13:36:59 +0300
commit7d611328076654dc13934743483cd2996055bddb (patch)
tree8954b4f26b65dc75ef75017dc0ae070553eb7310 /source/blender/editors
parentd8491cb7c6745f7c8335843470c7c0a9e2708a87 (diff)
Animation: improved error handling when adding/deleting keyframes
There are two ways in which adding/deleting keyframes can fail, but only one of those was handled. The other would be shown as a successful add/delete of -2 keyframes.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/animation/keyframing.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 1c60dcfbd52..22a42d56fcd 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1845,11 +1845,11 @@ static int insert_key_exec(bContext *C, wmOperator *op)
}
/* report failure or do updates? */
- if (num_channels == MODIFYKEY_INVALID_CONTEXT) {
+ if (num_channels < 0) {
BKE_report(op->reports, RPT_ERROR, "No suitable context info for active keying set");
return OPERATOR_CANCELLED;
}
- else if (num_channels) {
+ else if (num_channels > 0) {
/* if the appropriate properties have been set, make a note that we've inserted something */
if (RNA_boolean_get(op->ptr, "confirm_success")) {
BKE_reportf(op->reports,
@@ -2061,11 +2061,11 @@ static int delete_key_exec(bContext *C, wmOperator *op)
}
/* report failure or do updates? */
- if (num_channels == MODIFYKEY_INVALID_CONTEXT) {
+ if (num_channels < 0) {
BKE_report(op->reports, RPT_ERROR, "No suitable context info for active keying set");
return OPERATOR_CANCELLED;
}
- else if (num_channels) {
+ else if (num_channels > 0) {
/* if the appropriate properties have been set, make a note that we've inserted something */
if (RNA_boolean_get(op->ptr, "confirm_success")) {
BKE_reportf(op->reports,