archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Add option to id_make_local to force localization of datablock, even if not used locally.

Browse Source 
Will be used by link/append code.
This commit is contained in:
Bastien Montagne
2016-07-14 13:03:22 +02:00
parent f2509e764e
commit f87603662d
42 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/object.c
View File

@@ -1186,11 +1186,11 @@ Object *BKE_object_copy(Main *bmain, Object *ob)
return BKE_object_copy_ex(bmain, ob, false);
}
void BKE_object_make_local(Main *bmain, Object *ob)
void BKE_object_make_local(Main *bmain, Object *ob, const bool force_local)
{
bool is_local = false, is_lib = false;
/* - only lib users: do nothing
/* - only lib users: do nothing (unless force_local is set)
* - only local users: set flag
* - mixed: make copy
*/
@@ -1201,7 +1201,7 @@ void BKE_object_make_local(Main *bmain, Object *ob)
BKE_library_ID_test_usages(bmain, ob, &is_local, &is_lib);
if (is_local) {
if (force_local || is_local) {
if (!is_lib) {
id_clear_lib_data(bmain, &ob->id);
BKE_id_expand_local(&ob->id);