Commit: 150d5e82ea06337332f5058d917c743dc86f7a14 Author: Bastien Montagne Date: Fri Feb 14 12:33:58 2020 +0100 Branches: readfile-rework-refcount-handling https://developer.blender.org/rB150d5e82ea06337332f5058d917c743dc86f7a14
Merge branch 'libquery-handle-ui-pointers' into readfile-rework-refcount-handling =================================================================== =================================================================== diff --cc source/blender/blenloader/intern/readfile.c index d9ce2edee43,48416736ce3..9a9611e6542 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@@ -2625,9 -2650,11 +2650,11 @@@ static void lib_link_id(FileData *fd, M } if (id->override_library) { - id->override_library->reference = newlibadr_us(fd, id->lib, id->override_library->reference); - id->override_library->storage = newlibadr_us(fd, id->lib, id->override_library->storage); + id->override_library->reference = newlibadr(fd, id->lib, id->override_library->reference); + id->override_library->storage = newlibadr(fd, id->lib, id->override_library->storage); } + + lib_link_id_private_id(fd, bmain, id); } static void direct_link_id_override_property_operation_cb(FileData *fd, void *data) @@@ -4278,15 -4310,10 +4310,10 @@@ static void direct_link_curve(FileData /** \name Read ID: Texture * \{ */ - static void lib_link_texture(FileData *fd, Main *bmain, Tex *tex) + static void lib_link_texture(FileData *fd, Main *UNUSED(bmain), Tex *tex) { - tex->ima = newlibadr_us(fd, tex->id.lib, tex->ima); + tex->ima = newlibadr(fd, tex->id.lib, tex->ima); tex->ipo = newlibadr_us(fd, tex->id.lib, tex->ipo); // XXX deprecated - old animation system - - if (tex->nodetree) { - lib_link_id(fd, bmain, &tex->nodetree->id); - lib_link_ntree(fd, tex->id.lib, tex->nodetree); - } } static void direct_link_texture(FileData *fd, Tex *tex) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs