Commit: 880579b67062c886c1dfebd3b8a891565a97494c
Author: Bastien Montagne
Date: Tue Jul 18 12:21:55 2017 +0200
Branches: asset-engine
https://developer.blender.org/rB880579b67062c886c1dfebd3b8a891565a97494c
Merge branch 'master' into asset-engine
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library.c
index ed4fae8a1f8,2ea7342ff34..51e67568564
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -311,9 -307,9 +311,9 @@@ void BKE_id_expand_local(Main *bmain, I
/**
* Ensure new (copied) ID is fully made local.
*/
- void BKE_id_copy_ensure_local(Main *bmain, ID *old_id, ID *new_id)
+ void BKE_id_copy_ensure_local(Main *bmain, const ID *old_id, ID *new_id)
{
- if (ID_IS_LINKED_DATABLOCK(old_id)) {
+ if (ID_IS_LINKED(old_id)) {
BKE_id_expand_local(bmain, new_id);
BKE_id_lib_local_paths(bmain, old_id->lib, new_id);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
