diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-02-08 00:27:08 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-02-08 00:27:08 +0300 |
| commit | 44aaffc684dabc44047ac9540870045ccfe83aa3 (patch) | |
| tree | 57bd85c1baccb209368615a406a874c3a0d1380e /source/blender/windowmanager/intern/wm_files_link.c | |
| parent | b8d376174ca9b372a978c997a25ebf2ff31a9df0 (diff) | |
| parent | 00d2dfa93ae8a84b163930246709c50b8ee1e148 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files_link.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index fec4d51dbd8..a33df1bc1f2 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -442,7 +442,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) if (lapp_data->num_items == 0) { /* Early out in case there is nothing to link. */ wm_link_append_data_free(lapp_data); - return; + return OPERATOR_CANCELLED; } /* XXX We'd need re-entrant locking on Main for this to work... */ |