diff options
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 5 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 5e4fe4ce269..4b22a59a155 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -439,8 +439,9 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, #endif } } - /* In any case, we need to move all lib datablocks themselves - those are 'first level data', - * getting rid of them would imply updating spaces & co to prevent invalid pointers access. */ + /* In any case, we need to move all lib datablocks themselves - those are + * 'first level data', getting rid of them would imply updating spaces & co + * to prevent invalid pointers access. */ BLI_movelisttolist(&newmain->libraries, &oldmain->libraries); blo_join_main(&new_mainlist); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index bb766d7c6db..b88a2ca2167 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8050,7 +8050,8 @@ static void lib_link_workspace_layout_restore(struct IDNameLib_Map *id_map, BLI_mempool_iternew(so->treestore, &iter); while ((tselem = BLI_mempool_iterstep(&iter))) { - /* Do not try to restore pointers to drivers/sequence/etc., can crash in undo case! */ + /* Do not try to restore pointers to drivers/sequence/etc., + * can crash in undo case! */ if (TSE_IS_REAL_ID(tselem)) { tselem->id = restore_pointer_by_name(id_map, tselem->id, USER_IGNORE); } @@ -9724,7 +9725,8 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath) BKE_main_id_tag_all(bfd->main, LIB_TAG_NEW, false); - /* Now that all our data-blocks are loaded, we can re-generate overrides from their references. */ + /* Now that all our data-blocks are loaded, + * we can re-generate overrides from their references. */ if (fd->memfile == NULL) { /* Do not apply in undo case! */ BKE_main_override_static_update(bfd->main); |