diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 17:45:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 17:45:34 +0300 |
| commit | f0815b1322dc4f04dd949fd92049a99479e5f61d (patch) | |
| tree | 9388af5e754d416e3f9fac95a2cbc67e57531e9f /source/blender/windowmanager/intern/wm_files_link.c | |
| parent | fcc5d7c29e02eae1429009cc02eb9c75d159f245 (diff) | |
| parent | 863e395ad8bc0c921a9c836018e2c17262340f46 (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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 8cbb3e0cb70..c7d55b290f5 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -372,7 +372,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) if (view_layer && RNA_boolean_get(op->ptr, "autoselect")) { BKE_view_layer_base_deselect_all(view_layer); } - + /* tag everything, all untagged data can be made local * its also generally useful to know what is new * @@ -531,18 +531,18 @@ void WM_OT_link(wmOperatorType *ot) ot->name = "Link from Library"; ot->idname = "WM_OT_link"; ot->description = "Link from a Library .blend file"; - + ot->invoke = wm_link_append_invoke; ot->exec = wm_link_append_exec; ot->poll = wm_link_append_poll; - + ot->flag |= OPTYPE_UNDO; WM_operator_properties_filesel( ot, FILE_TYPE_FOLDER | FILE_TYPE_BLENDER | FILE_TYPE_BLENDERLIB, FILE_LOADLIB, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_DIRECTORY | WM_FILESEL_FILENAME | WM_FILESEL_RELPATH | WM_FILESEL_FILES, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); - + wm_link_append_properties_common(ot, true); } |