Merge branch 'master' into blender2.8

2018-02-07 22:27:08 +01:00
parent b8d376174c 00d2dfa93a
commit 44aaffc684
1 changed files with 1 additions and 1 deletions
--- 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... */