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

[Bastien Montagne]

Commit: 9b98bddc1155aed23eb943e1b5237708d9a4a249
Author: Bastien Montagne
Date:   Mon Dec 5 09:05:17 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB9b98bddc1155aed23eb943e1b5237708d9a4a249

Merge branch 'master' into asset-engine

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



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

diff --cc source/blender/makesdna/DNA_ID.h
index ad9e24a,59fd0c7..7bc66db
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@@ -384,16 -290,12 +384,16 @@@ typedef enum ID_Type 
  #endif
  #define GS(a)	(CHECK_TYPE_ANY(a, char *, const char *, char [66], const char[66]), (*((const short *)(a))))
  
- #define ID_NEW(a)		if (      (a) && (a)->id.newid ) (a) = (void *)(a)->id.newid
- #define ID_NEW_US(a)	if (      (a)->id.newid)       { (a) = (void *)(a)->id.newid;       (a)->id.us++; }
- #define ID_NEW_US2(a)	if (((ID *)a)->newid)          { (a) = ((ID  *)a)->newid;     ((ID *)a)->us++;    }
+ #define ID_NEW_SET(_id, _idn) \
+ 	(((ID *)(_id))->newid = (ID *)(_idn), ((ID *)(_id))->newid->tag |= LIB_TAG_NEW, (void *)((ID *)(_id))->newid)
+ #define ID_NEW_REMAP(a) if ((a) && (a)->id.newid) (a) = (void *)(a)->id.newid
  
 +#define ID_VIRTUAL_LIBRARY_VALID(_id) (ELEM(GS((_id)->name), ID_IM, ID_VF, ID_TXT, ID_SO))
 +
  /* id->flag (persitent). */
  enum {
 +	/* Flag asset IDs (the ones who should have a valid uuid). */
 +	LIB_ASSET           = 1 << 0,
  	LIB_FAKEUSER        = 1 << 9,
  };