[Bf-blender-cvs] [a7cfb5f] asset-engine: Merge branch 'master' into asset-engine
Bastien Montagne
noreply at git.blender.org
Tue Jan 12 16:20:50 CET 2016
Commit: a7cfb5fc22e9efd8f0dd0549a273613a5903bad0
Author: Bastien Montagne
Date: Tue Jan 12 16:08:05 2016 +0100
Branches: asset-engine
https://developer.blender.org/rBa7cfb5fc22e9efd8f0dd0549a273613a5903bad0
Merge branch 'master' into asset-engine
Conflicts:
source/blender/blenkernel/intern/library.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library.c
index bd1abd1,67b6661..d9a3068
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -1663,8 -1663,7 +1663,7 @@@ void id_clear_lib_data(Main *bmain, ID
id_fake_user_clear(id);
id->lib = NULL;
- id->tag &= ~(LIB_TAG_INDIRECT | LIB_TAG_EXTERN);
+ MEM_SAFE_FREE(id->uuid); /* Local ID have no more use for asset-related data. */
- id->tag |= LIB_TAG_LOCAL;
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 dcf4b09,bf47682..409e3c7
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@@ -103,13 -101,9 +103,13 @@@ struct ID *BLO_library_link_named_part_
struct Main *mainl, BlendHandle **bh,
const short idcode, const char *name, const short flag,
struct Scene *scene, struct View3D *v3d);
+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);
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);
More information about the Bf-blender-cvs
mailing list