diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:21:47 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:21:47 +0300 |
| commit | eb1feb9f4a62e3caca4b72964c9fdd8187df53e5 (patch) | |
| tree | 2c6b18ee72db4a386bf68425cc40620f9d49c48f /source/blender/blenloader/intern/readfile.c | |
| parent | 0b396bc15bd4433bfe9b8c6ffbc87d312d2426c1 (diff) | |
| parent | 16100f8261770e367b0892bb38c778699ed609fe (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/object/object_add.c
source/blender/editors/object/object_select.c
source/blender/editors/space_outliner/outliner_edit.c
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 1819928e20d..6c2293d2ec1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8268,7 +8268,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const short } else { DEBUG_PRINTF("... in %s (%s): ", main->curlib ? main->curlib->id.name : "<NULL>", main->curlib ? main->curlib->name : "<NULL>"); - if ((id = BKE_libblock_find_name_ex(main, GS(idname), idname + 2))) { + if ((id = BKE_libblock_find_name(main, GS(idname), idname + 2))) { DEBUG_PRINTF("FOUND!\n"); /* Even though we found our linked ID, there is no guarantee its address is still the same... */ if (id != bhead->old) { |