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

[Bastien Montagne]

Commit: cbbe76a5648a26535be02a0711db7a53910879a9
Author: Bastien Montagne
Date:   Mon Sep 30 11:34:29 2019 +0200
Branches: asset-engine
https://developer.blender.org/rBcbbe76a5648a26535be02a0711db7a53910879a9

Merge branch 'master' into asset-engine

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



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

diff --cc source/blender/editors/space_file/file_intern.h
index 9977c2dc266,b0ff67844d8..707a03edb16
--- a/source/blender/editors/space_file/file_intern.h
+++ b/source/blender/editors/space_file/file_intern.h
@@@ -110,9 -105,9 +105,10 @@@ void file_sfile_filepath_set(struct Spa
  void file_sfile_to_operator_ex(bContext *C,
                                 struct wmOperator *op,
                                 struct SpaceFile *sfile,
 -                               char *filepath);
 +                               char *filepath,
 +                               const bool is_fake);
  void file_sfile_to_operator(bContext *C, struct wmOperator *op, struct SpaceFile *sfile);
+ 
  void file_operator_to_sfile(bContext *C, struct SpaceFile *sfile, struct wmOperator *op);
  
  /* filesel.c */