[Bf-blender-cvs] [836883f1d20] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 836883f1d2022b891fe1c27ddab2c8368a294d6e
Author: Bastien Montagne
Date:   Tue Nov 5 14:35:04 2019 +0100
Branches: asset-engine
https://developer.blender.org/rB836883f1d2022b891fe1c27ddab2c8368a294d6e

Merge branch 'master' into asset-engine

Conflicts:
	release/scripts/startup/bl_ui/space_filebrowser.py
	source/blender/editors/space_file/file_ops.c

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



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

diff --cc source/blender/editors/space_file/file_ops.c
index 40a0e84f712,3cdcc07f081..1aee44d22d4
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -2478,21 -2397,19 +2478,21 @@@ void FILE_OT_filenum(struct wmOperatorT
  
  static void file_rename_state_activate(SpaceFile *sfile, int file_idx, bool require_selected)
  {
 -  const int numfiles = filelist_files_ensure(sfile->files);
 -
 -  if ((file_idx >= 0) && (file_idx < numfiles)) {
 -    FileDirEntry *file = filelist_file(sfile->files, file_idx);
 -
 -    if ((require_selected == false) ||
 -        (filelist_entry_select_get(sfile->files, file, CHECK_ALL) & FILE_SEL_SELECTED)) {
 -      filelist_entry_select_index_set(
 -          sfile->files, file_idx, FILE_SEL_ADD, FILE_SEL_EDITING, CHECK_ALL);
 -      BLI_strncpy(sfile->params->renamefile, file->relpath, FILE_MAXFILE);
 -      /* We can skip the pending state,
 -       * as we can directly set FILE_SEL_EDITING on the expected entry here. */
 -      sfile->params->rename_flag = FILE_PARAMS_RENAME_ACTIVE;
 +  if (sfile->params) {
 +    const int numfiles = filelist_files_ensure(sfile->files, sfile->params);
 +
-     if ((file_idx > 0) && (file_idx < numfiles)) {
++    if ((file_idx >= 0) && (file_idx < numfiles)) {
 +      FileDirEntry *file = filelist_file(sfile->files, file_idx);
 +
 +      if ((require_selected == false) ||
 +          (filelist_entry_select_get(sfile->files, file, CHECK_ALL) & FILE_SEL_SELECTED)) {
 +        filelist_entry_select_index_set(
 +            sfile->files, file_idx, FILE_SEL_ADD, FILE_SEL_EDITING, CHECK_ALL);
 +        BLI_strncpy(sfile->params->renamefile, file->relpath, FILE_MAXFILE);
 +        /* We can skip the pending state,
 +         * as we can directly set FILE_SEL_EDITING on the expected entry here. */
 +        sfile->params->rename_flag = FILE_PARAMS_RENAME_ACTIVE;
 +      }
      }
    }
  }