Commit: 945c062cf769ae0440e0a232357f94c7c332c64f
Author: Bastien Montagne
Date: Wed Jun 14 15:34:08 2017 +0200
Branches: asset-engine
https://developer.blender.org/rB945c062cf769ae0440e0a232357f94c7c332c64f
Merge branch 'master' into asset-engine
Conflicts:
source/blender/blenloader/intern/readfile.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library_remap.c
index 97b27e2e9ba,01ad4fb86ce..4035392c198
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@@ -729,36 -729,11 +729,15 @@@ void BKE_libblock_free_data(ID *id, con
IDP_FreeProperty_ex(id->properties, do_id_user);
MEM_freeN(id->properties);
}
+
+ if (id->uuid) {
+ MEM_freeN(id->uuid);
+ }
}
- /**
- * used in headerbuttons.c image.c mesh.c screen.c sound.c and library.c
- *
- * \param do_id_user: if \a true, try to release other ID's 'references' hold
by \a idv.
- * (only applies to main database)
- * \param do_ui_user: similar to do_id_user but makes sure UI does not hold
references to
- * \a id.
- */
- void BKE_libblock_free_ex(Main *bmain, void *idv, const bool do_id_user,
const bool do_ui_user)
+ void BKE_libblock_free_datablock(ID *id)
{
- ID *id = idv;
- short type = GS(id->name);
- ListBase *lb = which_libbase(bmain, type);
-
- DAG_id_type_tag(bmain, type);
-
- #ifdef WITH_PYTHON
- BPY_id_release(id);
- #endif
-
- if (do_id_user) {
- BKE_libblock_relink_ex(bmain, id, NULL, NULL, true);
- }
-
+ const short type = GS(id->name);
switch (type) {
case ID_SCE:
BKE_scene_free((Scene *)id);
diff --cc source/blender/blenloader/intern/readfile.c
index 280290663b1,f224f0b5633..cd12184e205
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -10195,10 -10158,8 +10195,10 @@@ void BLO_library_link_copypaste(Main *m
}
static ID *link_named_part_ex(
- Main *mainl, FileData *fd, const short idcode, const char *name,
const short flag,
- Scene *scene, View3D *v3d, const bool use_placeholders, const bool
force_indirect)
+ Main *mainl, FileData *fd, const AssetEngineType *aet, const char
*root,
- const short idcode, const char *name, const AssetUUID *uuid, const
int flag,
- Scene *scene, View3D *v3d,
++ const short idcode, const char *name, const AssetUUID *uuid, const
short flag,
++ Scene *scene, View3D *v3d,
+ const bool use_placeholders, const bool force_indirect)
{
ID *id = link_named_part(mainl, fd, idcode, name, use_placeholders,
force_indirect);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
