diff options
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index e9aec7201e2..8d9bffa1637 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1741,11 +1741,10 @@ Object *BKE_object_duplicate(Main *bmain, const Object *ob, const int dupflag) return obn; } -void BKE_object_make_local_ex(Main *bmain, - Object *ob, - const bool lib_local, - const bool clear_proxy) +void BKE_object_make_local(Main *bmain, Object *ob, const int flags) { + const bool lib_local = (flags & LIB_ID_MAKELOCAL_FULL_LIBRARY) != 0; + const bool clear_proxy = (flags & LIB_ID_MAKELOCAL_OBJECT_NO_PROXY_CLEARING) == 0; bool is_local = false, is_lib = false; /* - only lib users: do nothing (unless force_local is set) @@ -1789,11 +1788,6 @@ void BKE_object_make_local_ex(Main *bmain, } } -void BKE_object_make_local(Main *bmain, Object *ob, const bool lib_local) -{ - BKE_object_make_local_ex(bmain, ob, lib_local, true); -} - /* Returns true if the Object is from an external blend file (libdata) */ bool BKE_object_is_libdata(const Object *ob) { |