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

[Bastien Montagne]

Commit: fd12edebf434a58bd0f83b9465e5fa42c4774e6f
Author: Bastien Montagne
Date:   Tue Jun 7 09:42:52 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBfd12edebf434a58bd0f83b9465e5fa42c4774e6f

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/makesdna/DNA_ID.h

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



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

diff --cc source/blender/makesdna/DNA_ID.h
index 11d29cd,b0812a8..e45c733
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@@ -216,10 -142,8 +216,9 @@@ typedef struct AssetRepositoryRef 
   */
  typedef struct Library {
  	ID id;
- 	ID *idblock;
  	struct FileData *filedata;
 -	char name[1024];  /* path name used for reading, can be relative and edited in the outliner */
 +	/* path name used for reading, can be relative and edited in the outliner. */
 +	char name[1024];
  
  	/* absolute filepath, this is only for convenience, 'name' is the real path used on file read but in
  	 * some cases its useful to access the absolute one.
@@@ -231,7 -155,8 +230,10 @@@
  	
  	struct PackedFile *packedfile;
  
 +	AssetRepositoryRef *asset_repository;
++
+ 	int temp_index;
+ 	int _pad;
  } Library;
  
  enum eIconSizes {