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:
authorJoshua Leung <aligorith@gmail.com>2011-10-27 05:55:10 +0400
committerJoshua Leung <aligorith@gmail.com>2011-10-27 05:55:10 +0400
commit0ebda4ba5848e1f78cc4fff7abaab3844ab94734 (patch)
tree42539746e2575d577615efb2ed713b5c6262e1bc /source/blender/editors/animation/keyframes_general.c
parentcd852ce1a199da11f119394ea719f9699c76c995 (diff)
Bugfix [#29015] Copy n Paste keyframes and poses broken?
Improved error messages presented when trying to paste keyframes. Previously, "No keyframes to paste" would always be displayed, even if the copy/paste buffer had some contents but couldn't be pasted if there weren't any F-Curves selected to paste to.
Diffstat (limited to 'source/blender/editors/animation/keyframes_general.c')
-rw-r--r--source/blender/editors/animation/keyframes_general.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index 0f4546968ba..732f84bb33d 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -757,7 +757,9 @@ EnumPropertyItem keyframe_paste_merge_items[] = {
{0, NULL, 0, NULL, NULL}};
-/* This function pastes data from the keyframes copy/paste buffer */
+/* This function pastes data from the keyframes copy/paste buffer
+ * > return status code is whether the method FAILED to do anything
+ */
short paste_animedit_keys (bAnimContext *ac, ListBase *anim_data,
const eKeyPasteOffset offset_mode, const eKeyMergeMode merge_mode)
{
@@ -773,17 +775,17 @@ short paste_animedit_keys (bAnimContext *ac, ListBase *anim_data,
/* check if buffer is empty */
if (animcopybuf.first == NULL) {
- BKE_report(ac->reports, RPT_WARNING, "No data in buffer to paste");
+ BKE_report(ac->reports, RPT_ERROR, "No animation data in buffer to paste");
return -1;
}
if (anim_data->first == NULL) {
- BKE_report(ac->reports, RPT_WARNING, "No FCurves to paste into");
+ BKE_report(ac->reports, RPT_ERROR, "No selected F-Curves to paste into");
return -1;
}
/* mathods of offset */
- switch(offset_mode) {
+ switch (offset_mode) {
case KEYFRAME_PASTE_OFFSET_CFRA_START:
offset= (float)(CFRA - animcopy_firstframe);
break;