Commit: fbc2909cef83bce722fab8c68e49c878603b4ee8
Author: Sergey Sharybin
Date: Tue Jan 13 18:24:53 2015 +0500
Branches: master
https://developer.blender.org/rBfbc2909cef83bce722fab8c68e49c878603b4ee8
Make version_update() callback being invoked when linking/appending datablocks
This way addons and render engines which needs to do versioning code on files
will properly
do it when something is being linked or appended to the scene. Previously that
callback was
only called for the local main only, making it impossible to do tweaks on
linking.
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 7e10bff..5a3e914 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -105,6 +105,7 @@
#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"
@@ -7889,8 +7890,12 @@ 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);
@@ -9527,6 +9532,9 @@ 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)
diff --git a/source/blender/windowmanager/intern/wm_files.c
b/source/blender/windowmanager/intern/wm_files.c
index c1c31f6..c6f12f5 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -478,7 +478,6 @@ bool WM_file_read(bContext *C, const char *filepath,
ReportList *reports)
WM_operatortype_last_properties_clear_all();
/* important to do before NULL'ing the context */
- BLI_callback_exec(CTX_data_main(C), NULL,
BLI_CB_EVT_VERSION_UPDATE);
BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
if (!G.background) {
@@ -672,7 +671,6 @@ int wm_homefile_read(bContext *C, ReportList *reports, bool
from_memory, const c
WM_operatortype_last_properties_clear_all();
/* important to do before NULL'ing the context */
- BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_VERSION_UPDATE);
BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
WM_event_add_notifier(C, NC_WM | ND_FILEREAD, NULL);
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c
b/source/blender/windowmanager/intern/wm_init_exit.c
index cb03d02..03c6414 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -240,7 +240,6 @@ void WM_init(bContext *C, int argc, const char **argv)
*
* unlikely any handlers are set but its possible,
* note that recovering the last session does its own
callbacks. */
- BLI_callback_exec(CTX_data_main(C), NULL,
BLI_CB_EVT_VERSION_UPDATE);
BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
