[Bf-blender-cvs] [2e82971] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 2e8297108d30f915fe339fc608b7bdc64899fdb9
Author: Bastien Montagne
Date:   Wed Jan 6 21:40:12 2016 +0100
Branches: id-remap
https://developer.blender.org/rB2e8297108d30f915fe339fc608b7bdc64899fdb9

Merge branch 'master' into id-remap

Conflicts:
	source/blender/blenkernel/BKE_library_query.h
	source/blender/blenkernel/intern/library_query.c
	source/blender/makesrna/intern/rna_ID.c

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



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

diff --cc source/blender/makesrna/intern/rna_ID.c
index 689b53b,63ea836..cb2428c
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@@ -335,41 -333,6 +335,19 @@@ static void rna_ID_user_clear(ID *id
  	id->us = 0; /* don't save */
  }
  
 +static void rna_ID_delete(ID *id, Main *bmain)
 +{
 +	BKE_libblock_delete(bmain, id);
 +}
 +
 +static void rna_ID_user_remap(ID *id, Main *bmain, ID *new_id)
 +{
 +	if (GS(id->name) == GS(new_id->name)) {
 +		/* For now, do not allow remapping data in linked data from here... */
 +		BKE_libblock_remap(bmain, id, new_id, ID_REMAP_SKIP_INDIRECT_USAGE | ID_REMAP_SKIP_NEVER_NULL_USAGE);
 +	}
 +}
 +
- static CollectionListBase rna_ID_used_by_ids(ID *id, Main *bmain)
- {
- 	ListBase ret = {0};
- 	struct IDUsersIter *iter = BKE_library_ID_users_iter_init(bmain, id);
- 	ID *id_user;
- 
- 	do {
- 		id_user = BKE_library_ID_users_iter_next(iter, NULL);
- 
- 		if (id_user) {
- 			CollectionPointerLink *lnk = MEM_mallocN(sizeof(*lnk), __func__);
- 			RNA_id_pointer_create(id_user, &lnk->ptr);
- 			BLI_addtail(&ret, lnk);
- 		}
- 	} while (id_user != NULL);
- 
- 	BKE_library_ID_users_iter_end(&iter);
- 
- 	/* CollectionListBase is a mere RNA redefinition of ListBase. */
- 	return *(CollectionListBase *)&ret;
- }
- 
  static AnimData * rna_ID_animation_data_create(ID *id, Main *bmain)
  {
  	AnimData *adt = BKE_animdata_add_id(id);