[Bf-blender-cvs] [f40a7b41ae2] filebrowser_redesign: Merge branch 'master' into filebrowser_redesign

[Julian Eisel]

Commit: f40a7b41ae2fe9e90efb7c1ab09e10c09842720b
Author: Julian Eisel
Date:   Mon May 6 17:44:45 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rBf40a7b41ae2fe9e90efb7c1ab09e10c09842720b

Merge branch 'master' into filebrowser_redesign

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/space_filebrowser.py
index aa3ec65526e,9fffa253329..ee95cf568ea
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@@ -315,14 -278,13 +333,15 @@@ class FILEBROWSER_MT_view(Menu)
  classes = (
      FILEBROWSER_HT_header,
      FILEBROWSER_UL_dir,
-     FILEBROWSER_PT_system_folders,
-     FILEBROWSER_PT_system_bookmarks,
-     FILEBROWSER_MT_bookmarks_context_menu,
      FILEBROWSER_PT_bookmarks,
-     FILEBROWSER_PT_recent_folders,
+     FILEBROWSER_PT_bookmarks_volumes,
+     FILEBROWSER_PT_bookmarks_system,
+     FILEBROWSER_MT_bookmarks_context_menu,
+     FILEBROWSER_PT_bookmarks_favorites,
+     FILEBROWSER_PT_bookmarks_recents,
      FILEBROWSER_PT_advanced_filter,
 +    FILEBROWSER_PT_directory_path,
 +    FILEBROWSER_PT_file_operation,
      FILEBROWSER_MT_view,
  )