diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-14 21:49:18 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-14 21:49:18 +0400 |
| commit | 4f00737f4b0457e31611f32bcafbf78867487c85 (patch) | |
| tree | 6899c9cafc62340b3d4ce4a74fc654fe4013e112 | |
| parent | 2ab9a0ff0972ce62d96aada3bf7d2de083a169b3 (diff) | |
Fix T39736: Ctrl+V reports "Objects Pasted" regardless if it worked or not.
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 3383ac3660a..7c7730c43f4 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -71,7 +71,6 @@ static int view3d_copybuffer_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN (C, Object *, ob, selected_objects) { BKE_copybuffer_tag_ID(&ob->id); - } CTX_DATA_END; @@ -99,15 +98,19 @@ static void VIEW3D_OT_copybuffer(wmOperatorType *ot) static int view3d_pastebuffer_exec(bContext *C, wmOperator *op) { char str[FILE_MAX]; - + BLI_make_file_string("/", str, BLI_temporary_dir(), "copybuffer.blend"); - BKE_copybuffer_paste(C, str, op->reports); + if (BKE_copybuffer_paste(C, str, op->reports)) { + WM_event_add_notifier(C, NC_WINDOW, NULL); - WM_event_add_notifier(C, NC_WINDOW, NULL); - - BKE_report(op->reports, RPT_INFO, "Objects pasted from buffer"); + BKE_report(op->reports, RPT_INFO, "Objects pasted from buffer"); - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; + } + + BKE_report(op->reports, RPT_INFO, "No buffer to paste from"); + + return OPERATOR_CANCELLED; } static void VIEW3D_OT_pastebuffer(wmOperatorType *ot) |