[Bf-blender-cvs] [8af7d78] asset-experiments: Merge branch 'id-remap' into asset-experiments

[Bastien Montagne]

Commit: 8af7d783c74a943d59652237e703b12e07ea8186
Author: Bastien Montagne
Date:   Tue Jan 12 16:21:34 2016 +0100
Branches: asset-experiments
https://developer.blender.org/rB8af7d783c74a943d59652237e703b12e07ea8186

Merge branch 'id-remap' into asset-experiments

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

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



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

diff --cc source/blender/blenkernel/intern/library.c
index cfa9a62,09047bc..159754b
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -2048,8 -2052,7 +2052,8 @@@ void id_clear_lib_data(Main *bmain, ID 
  	id_fake_user_clear(id);
  
  	id->lib = NULL;
 +	MEM_SAFE_FREE(id->uuid);  /* Local ID have no more use for asset-related data. */
- 	id->tag |= LIB_TAG_LOCAL;
+ 	id->tag &= ~(LIB_TAG_INDIRECT | LIB_TAG_EXTERN);
  	new_id(which_libbase(bmain, GS(id->name)), id, NULL);
  
  	/* internal bNodeTree blocks inside ID types below
diff --cc source/blender/blenloader/BLO_readfile.h
index 3df6183,c85cf12..10b8d7c
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@@ -104,14 -102,9 +104,14 @@@ struct ID *BLO_library_link_named_part_
          const short idcode, const char *name, const short flag,
          struct Scene *scene, struct View3D *v3d,
          const bool use_placeholders, const bool force_indirect);
 +struct ID *BLO_library_link_named_part_asset(
 +        struct Main *mainl, BlendHandle **bh, const struct AssetEngineType *aet,
 +        const short idcode, const char *name, const struct AssetUUID *uuid, const short flag,
 +        struct Scene *scene, struct View3D *v3d,
 +        const bool use_placeholders, const bool force_indirect);
  void BLO_library_link_end(struct Main *mainl, BlendHandle **bh, short flag, struct Scene *scene, struct View3D *v3d);
  
- void BLO_library_link_all(struct Main *mainl, BlendHandle *bh);
+ void BLO_library_link_copypaste(struct Main *mainl, BlendHandle *bh);
  
  void *BLO_library_read_struct(struct FileData *fd, struct BHead *bh, const char *blockname);