diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-18 12:25:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-18 12:25:44 +0300 |
| commit | 9186b9ae4806f4bbc1a14417c408e844f8e8cc1a (patch) | |
| tree | 117bbd4ace75825e3a65f0ba2a447509bde0df85 /source/blender/blenkernel/intern/object.c | |
| parent | cfbd605567f48229a923df382baf6db98fbafc61 (diff) | |
| parent | 9946cca14676bf07b3c7c103e99033fe1e4e423e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 00c25bed1f7..5d654515fc8 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1023,11 +1023,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 */ @@ -1038,7 +1038,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); |