[Bf-blender-cvs] [921c37bfa31] master: Fix T62050: remove non-persistent timers in load-pre callback

Jacques Lucke noreply at git.blender.org
Thu Feb 28 16:09:45 CET 2019


Commit: 921c37bfa3108708cb6c2a6cd7c1b1a588be2d74
Author: Jacques Lucke
Date:   Thu Feb 28 16:07:56 2019 +0100
Branches: master
https://developer.blender.org/rB921c37bfa3108708cb6c2a6cd7c1b1a588be2d74

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.

===================================================================

M	source/blender/blenlib/intern/BLI_timer.c

===================================================================

diff --git a/source/blender/blenlib/intern/BLI_timer.c b/source/blender/blenlib/intern/BLI_timer.c
index a09dc7f68ec..d361a1c563d 100644
--- a/source/blender/blenlib/intern/BLI_timer.c
+++ b/source/blender/blenlib/intern/BLI_timer.c
@@ -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;
 	}
 }



More information about the Bf-blender-cvs mailing list