diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-15 12:22:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-15 12:22:28 +0300 |
| commit | a0fd7ab28d5365985c8684079097e102915a3bde (patch) | |
| tree | 24b115f7bebcc46feebf8ec4b8d5fcb6971b3ab1 /source/blender/blenloader | |
| parent | 08cc4bfa615e4f58ca9799730c532edbe35c449e (diff) | |
Revert "Make version_update() callback being invoked when linking/appending datablocks"
This reverts commit fbc2909cef83bce722fab8c68e49c878603b4ee8.
The reason for revert is that the commit made it so bpy.data is not set to any
of the new main (on both file open and file link/append) which basically totally
broke versioning code.
Needs some smarter solution there.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5a3e9141fad..7e10bff49a4 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -105,7 +105,6 @@ #include "BLI_endian_switch.h" #include "BLI_blenlib.h" -#include "BLI_callbacks.h" #include "BLI_math.h" #include "BLI_threads.h" #include "BLI_mempool.h" @@ -7890,12 +7889,8 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath) } /* do before read_libraries, but skip undo case */ - if (fd->memfile==NULL) { + if (fd->memfile==NULL) do_versions(fd, NULL, bfd->main); - if (BLI_thread_is_main()) { - BLI_callback_exec(bfd->main, NULL, BLI_CB_EVT_VERSION_UPDATE); - } - } do_versions_userdef(fd, bfd); @@ -9532,9 +9527,6 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) do_versions(mainptr->curlib->filedata, mainptr->curlib, mainptr); else do_versions(basefd, NULL, mainptr); - if (BLI_thread_is_main()) { - BLI_callback_exec(mainptr, NULL, BLI_CB_EVT_VERSION_UPDATE); - } } if (mainptr->curlib->filedata) |