[Bf-blender-cvs] [e7ac5954c9e] asset-engine: Merge branch 'asset-uuid' into asset-engine

[Bastien Montagne]

Commit: e7ac5954c9e1c800af07eacc68b31411425d13ab
Author: Bastien Montagne
Date:   Mon Nov 25 18:09:49 2019 +0100
Branches: asset-engine
https://developer.blender.org/rBe7ac5954c9e1c800af07eacc68b31411425d13ab

Merge branch 'asset-uuid' into asset-engine

Conflicts:
	source/blender/blenkernel/BKE_asset_engine.h
	source/blender/blenkernel/intern/asset_engine.c
	source/blender/blenloader/BLO_readfile.h
	source/blender/makesdna/DNA_ID.h
	source/blender/makesdna/DNA_space_types.h
	source/blender/makesrna/RNA_access.h
	source/blender/makesrna/intern/rna_ID.c
	source/blender/makesrna/intern/rna_asset.c

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



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

diff --cc source/blender/makesdna/DNA_space_types.h
index a808f89b99b,081be17d392..c46079a3419
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@@ -730,9 -730,7 +730,10 @@@ typedef struct SpaceFile 
    char _pad1[4];
    int scroll_offset;
  
 +  /* BKE_ST_MAXNAME */
 +  char asset_engine[64];
 +
+   /** Config and input for file select. */
    struct FileSelectParams *params;
  
    /** Holds the list of files to show. */