diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/space_file | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r-- | source/blender/editors/space_file/file_intern.h | 1 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_panels.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.h | 1 | ||||
-rw-r--r-- | source/blender/editors/space_file/fsmenu.h | 1 | ||||
-rw-r--r-- | source/blender/editors/space_file/space_file.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index 742715039cf..6eaf2dda084 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -130,4 +130,3 @@ void file_panels_register(struct ARegionType *art); void file_tile_boundbox(const ARegion *ar, FileLayout *layout, const int file, rcti *r_bounds); #endif /* __FILE_INTERN_H__ */ - diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c index 78bbe3aea58..11b891d1c1e 100644 --- a/source/blender/editors/space_file/file_panels.c +++ b/source/blender/editors/space_file/file_panels.c @@ -107,4 +107,3 @@ void file_panels_register(ARegionType *art) pt->draw = file_panel_operator; BLI_addtail(&art->paneltypes, pt); } - diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h index 4e9c1e0dd1d..76845c44226 100644 --- a/source/blender/editors/space_file/filelist.h +++ b/source/blender/editors/space_file/filelist.h @@ -127,4 +127,3 @@ bool filelist_cache_previews_running(struct FileList *filelist); #endif #endif - diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h index 85804538e19..bb201a7a80c 100644 --- a/source/blender/editors/space_file/fsmenu.h +++ b/source/blender/editors/space_file/fsmenu.h @@ -80,4 +80,3 @@ void fsmenu_refresh_bookmarks_status(struct FSMenu *fsmenu); int fsmenu_get_active_indices(struct FSMenu *fsmenu, enum FSMenuCategory category, const char *dir); #endif - diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 8798c7b01c0..b8287d27df7 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -855,4 +855,3 @@ void ED_file_read_bookmarks(void) fsmenu_read_bookmarks(ED_fsmenu_get(), name); } } - |