blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Fix T62050: remove non-persistent timers in load-pre callback 

This actually makes more sense than removing them in the
load-post callback. During load, the file might register
timers that would be removed immediately.
This commit is contained in:
Jacques Lucke 2019-02-28 16:07:56 +01:00
parent 5938fd4ccc
commit 921c37bfa3
Notes: blender-bot 2023-02-14 03:33:04 +01:00 
Referenced by issue #62050, 2.8: Python API: Application Timers do not work in registered scripts
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/intern/BLI_timer.c
View File

@ -164,7 +164,7 @@ static void remove_non_persistent_functions(struct Main *UNUSED(_1), struct ID *
}
}
static bCallbackFuncStore load_post_callback = {
static bCallbackFuncStore load_pre_callback = {
NULL, NULL, /* next, prev */
remove_non_persistent_functions, /* func */
NULL, /* arg */
@ -174,7 +174,7 @@ static bCallbackFuncStore load_post_callback = {
static void ensure_callback_is_registered()
{
if (!GlobalTimer.file_load_cb_registered) {
BLI_callback_add(&load_post_callback, BLI_CB_EVT_LOAD_POST);
BLI_callback_add(&load_pre_callback, BLI_CB_EVT_LOAD_PRE);
GlobalTimer.file_load_cb_registered = true;
}
}