diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-05-15 17:54:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-05-15 17:54:33 +0300 |
| commit | 0f2c7f386487b8839eac4a83762549ea899a279d (patch) | |
| tree | 207309349a69302a453f2a43ec10d4b4139de5cc /source/blender/blenloader | |
| parent | 363f18c8b58dd2ba637aed171e75a346e86e7753 (diff) | |
| parent | 0541906162c8578413d4e15c0b3672b48f143f8a (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 9cbe6056dc4..22189201ee8 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2721,7 +2721,7 @@ static void lib_link_id(FileData *fd, Main *bmain, ID *id); static void lib_link_nodetree(FileData *fd, Main *bmain, bNodeTree *ntree); static void lib_link_collection(FileData *fd, Main *bmain, Collection *collection); -static void lib_link_id_private_id(FileData *fd, Main *bmain, ID *id) +static void lib_link_id_embedded_id(FileData *fd, Main *bmain, ID *id) { /* Handle 'private IDs'. */ bNodeTree *nodetree = ntreeFromID(id); @@ -2755,7 +2755,7 @@ static void lib_link_id(FileData *fd, Main *bmain, ID *id) id->override_library->storage = newlibadr(fd, id->lib, id->override_library->storage); } - lib_link_id_private_id(fd, bmain, id); + lib_link_id_embedded_id(fd, bmain, id); } static void direct_link_id_override_property_operation_cb(FileData *fd, void *data) @@ -2783,7 +2783,7 @@ static void direct_link_id_common(FileData *fd, ID *id, ID *id_old, const int ta static void direct_link_nodetree(FileData *fd, bNodeTree *ntree); static void direct_link_collection(FileData *fd, Collection *collection); -static void direct_link_id_private_id(FileData *fd, ID *id, ID *id_old) +static void direct_link_id_embedded_id(FileData *fd, ID *id, ID *id_old) { /* Handle 'private IDs'. */ bNodeTree **nodetree = BKE_ntree_ptr_from_id(id); @@ -2907,7 +2907,7 @@ static void direct_link_id_common(FileData *fd, ID *id, ID *id_old, const int ta } /* Handle 'private IDs'. */ - direct_link_id_private_id(fd, id, id_old); + direct_link_id_embedded_id(fd, id, id_old); } /** \} */ @@ -10920,7 +10920,7 @@ static void expand_id(FileData *fd, Main *mainvar, ID *id); static void expand_nodetree(FileData *fd, Main *mainvar, bNodeTree *ntree); static void expand_collection(FileData *fd, Main *mainvar, Collection *collection); -static void expand_id_private_id(FileData *fd, Main *mainvar, ID *id) +static void expand_id_embedded_id(FileData *fd, Main *mainvar, ID *id) { /* Handle 'private IDs'. */ bNodeTree *nodetree = ntreeFromID(id); @@ -10952,7 +10952,7 @@ static void expand_id(FileData *fd, Main *mainvar, ID *id) expand_animdata(fd, mainvar, adt); } - expand_id_private_id(fd, mainvar, id); + expand_id_embedded_id(fd, mainvar, id); } static void expand_action(FileData *fd, Main *mainvar, bAction *act) |