diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
| commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
| tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender/blenkernel/intern/library.c | |
| parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
| parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 667352b6ddb..cb045f7bae2 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1806,10 +1806,6 @@ bool new_id(ListBase *lb, ID *id, const char *tname) if (ID_IS_LINKED_DATABLOCK(id)) return false; - /* if no libdata given, look up based on ID */ - if (lb == NULL) - lb = which_libbase(G.main, GS(id->name)); - /* if no name given, use name of current ID * else make a copy (tname args can be const) */ if (tname == NULL) @@ -1964,7 +1960,7 @@ static void library_make_local_copying_check(ID *id, GSet *loop_tags, MainIDRela * * Current version uses regular id_make_local callback, with advanced pre-processing step to detect all cases of * IDs currently indirectly used, but which will be used by local data only once this function is finished. - * This allows to avoid any uneeded duplication of IDs, and hence all time lost afterwards to remove + * This allows to avoid any unneeded duplication of IDs, and hence all time lost afterwards to remove * orphaned linked data-blocks... */ void BKE_library_make_local( @@ -2353,7 +2349,6 @@ void BLI_libblock_ensure_unique_name(Main *bmain, const char *name) ListBase *lb; ID *idtest; - lb = which_libbase(bmain, GS(name)); if (lb == NULL) return; |