diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/pose_transform.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c index 3c21919a7ac..cbb6d63aefe 100644 --- a/source/blender/editors/armature/pose_transform.c +++ b/source/blender/editors/armature/pose_transform.c @@ -530,7 +530,7 @@ static int pose_paste_exec(bContext *C, wmOperator *op) char str[FILE_MAX]; Main *tmp_bmain = BKE_main_new(); BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer_pose.blend"); - if (!BKE_copybuffer_read(tmp_bmain, str, op->reports)) { + if (!BKE_copybuffer_read(tmp_bmain, str, op->reports, FILTER_ID_OB)) { BKE_report(op->reports, RPT_ERROR, "Copy buffer is empty"); BKE_main_free(tmp_bmain); return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 31c9be02311..1ec75e06cc9 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -107,17 +107,18 @@ static int view3d_pastebuffer_exec(bContext *C, wmOperator *op) flag |= FILE_ACTIVE_COLLECTION; BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend"); - if (BKE_copybuffer_paste(C, str, flag, op->reports)) { - WM_event_add_notifier(C, NC_WINDOW, NULL); - BKE_report(op->reports, RPT_INFO, "Objects pasted from buffer"); - - return OPERATOR_FINISHED; + const int num_pasted = BKE_copybuffer_paste(C, str, flag, op->reports, FILTER_ID_OB); + if (num_pasted == 0) { + BKE_report(op->reports, RPT_INFO, "No buffer to paste from"); + return OPERATOR_CANCELLED; } - BKE_report(op->reports, RPT_INFO, "No buffer to paste from"); + WM_event_add_notifier(C, NC_WINDOW, NULL); + + BKE_reportf(op->reports, RPT_INFO, "%d objects pasted from buffer", num_pasted); - return OPERATOR_CANCELLED; + return OPERATOR_FINISHED; } static void VIEW3D_OT_pastebuffer(wmOperatorType *ot) |