[Bf-blender-cvs] [4813ed0e4a8] asset-engine: Merge branch 'master' into asset-engine
Bastien Montagne
noreply at git.blender.org
Tue May 30 18:07:37 CEST 2017
Commit: 4813ed0e4a804304ec206cb1de9525a5d83bfee0
Author: Bastien Montagne
Date: Tue May 30 17:22:45 2017 +0200
Branches: asset-engine
https://developer.blender.org/rB4813ed0e4a804304ec206cb1de9525a5d83bfee0
Merge branch 'master' into asset-engine
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library_query.c
index 207c5d882fc,931002e6bbc..3cf86040784
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -488,9 -538,9 +538,9 @@@ void BKE_library_foreach_ID_link(Main *
* Since this field is set/owned by 'user' of this ID (and not ID itself), it is only indirect usage
* if proxy object is linked... Twisted. */
if (object->proxy_from) {
- data.cb_flag = ID_IS_LINKED_DATABLOCK(object->proxy_from) ? IDWALK_CB_INDIRECT_USAGE : 0;
+ data.cb_flag = ID_IS_LINKED(object->proxy_from) ? IDWALK_CB_INDIRECT_USAGE : 0;
}
- CALLBACK_INVOKE(object->proxy_from, IDWALK_CB_NOP);
+ CALLBACK_INVOKE(object->proxy_from, IDWALK_CB_LOOPBACK);
data.cb_flag = data_cb_flag;
CALLBACK_INVOKE(object->poselib, IDWALK_CB_USER);
diff --cc source/blender/blenkernel/intern/library_remap.c
index a3a160fb46f,24626c6ead7..97b27e2e9ba
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@@ -723,16 -723,12 +723,16 @@@ void BKE_libblock_relink_to_newid(ID *i
BKE_library_foreach_ID_link(NULL, id, id_relink_to_newid_looper, NULL, 0);
}
- void BKE_libblock_free_data(Main *UNUSED(bmain), ID *id)
+ void BKE_libblock_free_data(Main *UNUSED(bmain), ID *id, const bool do_id_user)
{
if (id->properties) {
- IDP_FreeProperty(id->properties);
+ IDP_FreeProperty_ex(id->properties, do_id_user);
MEM_freeN(id->properties);
}
+
+ if (id->uuid) {
+ MEM_freeN(id->uuid);
+ }
}
/**
More information about the Bf-blender-cvs
mailing list