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

[Bastien Montagne]

Commit: ac2e25986c8856657758edfebbac450428389599
Author: Bastien Montagne
Date:   Fri Feb 12 10:05:28 2016 +0100
Branches: asset-engine
https://developer.blender.org/rBac2e25986c8856657758edfebbac450428389599

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/blenkernel/intern/library.c

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



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

diff --cc source/blender/blenkernel/intern/library.c
index d9a3068,c460320..3f96792
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -1663,8 -1663,9 +1663,10 @@@ void id_clear_lib_data_ex(Main *bmain, 
  	id_fake_user_clear(id);
  
  	id->lib = NULL;
 +	MEM_SAFE_FREE(id->uuid);  /* Local ID have no more use for asset-related data. */
- 	new_id(which_libbase(bmain, GS(id->name)), id, NULL);
+ 	id->tag &= ~(LIB_TAG_INDIRECT | LIB_TAG_EXTERN);
+ 	if (id_in_mainlist)
+ 		new_id(which_libbase(bmain, GS(id->name)), id, NULL);
  
  	/* internal bNodeTree blocks inside ID types below
  	 * also stores id->lib, make sure this stays in sync.