diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-08-26 12:52:52 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-08-26 12:52:52 +0300 |
| commit | 6129e20cec4639aebf335ff13b2ba0c59670662d (patch) | |
| tree | a36691d3c487e376f0fa21676ca6e416f051e9a4 /source/blender/editors/space_file | |
| parent | 03bbd5f9dedf7b3dfea7119c172c61f0b50ae28c (diff) | |
| parent | 27787549256410b6b2de1eca47a2719830af7f96 (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index e06ee620ea7..f7dda1defe8 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -2917,7 +2917,7 @@ void filelist_readjob_start(FileList *filelist, const bContext *C) /* setup job */ wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), - CTX_wm_area(C), + CTX_data_scene(C), "Listing Dirs...", WM_JOB_PROGRESS, WM_JOB_TYPE_FILESEL_READDIR); |