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

[Bastien Montagne]

Commit: e6fc7ea8736d4b35ba26edebcaa2a4dfd894b9ef
Author: Bastien Montagne
Date:   Wed Nov 16 16:48:49 2016 +0100
Branches: asset-engine
https://developer.blender.org/rBe6fc7ea8736d4b35ba26edebcaa2a4dfd894b9ef

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/blenkernel/BKE_library.h
	source/blender/blenkernel/intern/library_remap.c

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



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

diff --cc source/blender/blenkernel/BKE_library.h
index 82cecb8,855eb10..f43206a
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@@ -131,21 -129,9 +131,24 @@@ void BKE_library_make_local
          struct Main *bmain, const struct Library *lib, struct GHash *old_to_new_ids,
          const bool untagged_only, const bool set_fake);
  
+ void BKE_id_tag_set_atomic(struct ID *id, int tag);
+ void BKE_id_tag_clear_atomic(struct ID *id, int tag);
+ 
 +void BKE_library_asset_repository_init(struct Library *lib, const struct AssetEngineType *aet, const char *repo_root);
 +void BKE_library_asset_repository_clear(struct Library *lib);
 +void BKE_library_asset_repository_free(struct Library *lib);
 +struct AssetRef *BKE_library_asset_repository_asset_add(struct Library *lib, const void *idv);
 +void BKE_library_asset_repository_asset_remove(struct Library *lib, const void *idv);
 +struct AssetRef *BKE_library_asset_repository_asset_find(struct Library *lib, const void *idv);
 +void BKE_library_asset_repository_subdata_add(struct AssetRef *aref, const void *idv);
 +void BKE_library_asset_repository_subdata_remove(struct AssetRef *aref, const void *idv);
 +
 +void BKE_libraries_asset_subdata_remove(struct Main *bmain, const void *idv);
 +void BKE_libraries_asset_repositories_clear(struct Main *bmain);
 +void BKE_libraries_asset_repositories_rebuild(struct Main *bmain);
 +struct AssetRef *BKE_libraries_asset_repository_uuid_find(struct Main *bmain, const struct AssetUUID *uuid);
 +struct Library *BKE_library_asset_virtual_ensure(struct Main *bmain, const struct AssetEngineType *aet);
 +
  /* use when "" is given to new_id() */
  #define ID_FALLBACK_NAME N_("Untitled")
  
diff --cc source/blender/blenkernel/intern/library_remap.c
index 14ecb01,4044103..6147b4b
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@@ -695,13 -672,6 +672,10 @@@ void BKE_libblock_free_data(Main *UNUSE
  		IDP_FreeProperty(id->properties);
  		MEM_freeN(id->properties);
  	}
- 	
++
 +	if (id->uuid) {
 +		MEM_freeN(id->uuid);
 +	}
- 
- 	/* this ID may be a driver target! */
- 	BKE_animdata_main_cb(bmain, animdata_dtar_clear_cb, (void *)id);
  }
  
  /**