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

[Julian Eisel]

Commit: 9dc25744b344927eecd55cc75fe405c303bb2991
Author: Julian Eisel
Date:   Wed Apr 24 13:55:28 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rB9dc25744b344927eecd55cc75fe405c303bb2991

Merge branch 'master' into filebrowser_redesign

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



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

diff --cc source/blender/blenkernel/BKE_blender_version.h
index 2433b856697,16655d9b060..e01f6a6b751
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -27,7 -27,7 +27,7 @@@
   * \note Use #STRINGIFY() rather than defining with quotes.
   */
  #define BLENDER_VERSION 280
- #define BLENDER_SUBVERSION 58
 -#define BLENDER_SUBVERSION 59
++#define BLENDER_SUBVERSION 60
  /** Several breakages with 280, e.g. collections vs layers. */
  #define BLENDER_MINVERSION 280
  #define BLENDER_MINSUBVERSION 0
diff --cc source/blender/editors/space_file/file_draw.c
index f92c10fd39e,bb8680682d2..81cbd46896c
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@@ -194,9 -193,39 +194,10 @@@ void file_draw_filepath_buttons(const b
  
      /* TODO, directory editing is non-functional while a library is loaded
       * until this is properly supported just disable it. */
-     if (sfile->files && filelist_lib(sfile->files))
+     if (sfile->files && filelist_lib(sfile->files)) {
        UI_but_flag_enable(but, UI_BUT_DISABLED);
+     }
  
 -    if ((params->flag & FILE_DIRSEL_ONLY) == 0) {
 -      but = uiDefBut(
 -          block,
 -          UI_BTYPE_TEXT,
 -          -1,
 -          "",
 -          min_x,
 -          line2_y,
 -          line2_w - chan_offs,
 -          btn_h,
 -          is_active_dir ? (char *)"" : params->file,
 -          0.0,
 -          (float)FILE_MAXFILE,
 -          0,
 -          0,
 -          TIP_(overwrite_alert ? N_("File name, overwrite existing") : N_("File name")));
 -      UI_but_func_complete_set(but, autocomplete_file, NULL);
 -      UI_but_flag_enable(but, UI_BUT_NO_UTF8);
 -      UI_but_flag_disable(but, UI_BUT_UNDO);
 -      /* silly workaround calling NFunc to ensure this does not get called
 -       * immediate ui_apply_but_func but only after button deactivates */
 -      UI_but_funcN_set(but, file_filename_enter_handle, NULL, but);
 -
 -      /* check if this overrides a file and if the operator option is used */
 -      if (overwrite_alert) {
 -        UI_but_flag_enable(but, UI_BUT_REDALERT);
 -      }
 -    }
 -
      /* clear func */
      UI_block_func_set(block, NULL, NULL, NULL);
    }