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

[Julian Eisel]

Commit: 20278a3776813286993c95f65791f4eaca513b81
Author: Julian Eisel
Date:   Thu Aug 22 13:25:50 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rB20278a3776813286993c95f65791f4eaca513b81

Merge branch 'master' into filebrowser_redesign

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



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

diff --cc source/blender/blenloader/intern/versioning_userdef.c
index 2ef1a5c096c,8bbfc29131e..67b8ce1d0de
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@@ -145,12 -150,6 +150,7 @@@ static void do_versions_theme(const Use
     * Include next version bump.
     */
    {
-     FROM_DEFAULT_V4_UCHAR(space_outliner.selected_highlight);
-     FROM_DEFAULT_V4_UCHAR(space_outliner.active);
- 
- 
- 
 +    FROM_DEFAULT_V4_UCHAR(space_file.execution_buts);
    }
  
  #undef FROM_DEFAULT_V4_UCHAR