[Bf-blender-cvs] [be91d4ef957] blender2.8: Fix T55774: Crash when reloading clip during prefetch

Sergey Sharybin noreply at git.blender.org
Tue Dec 4 16:40:08 CET 2018


Commit: be91d4ef95760492869e6a80f9ef80da059a223f
Author: Sergey Sharybin
Date:   Tue Dec 4 16:39:21 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBbe91d4ef95760492869e6a80f9ef80da059a223f

Fix T55774: Crash when reloading clip during prefetch

Simply kill prefetch jobs when reloading. Not sure what else
we can do here..

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

M	source/blender/editors/space_clip/clip_ops.c

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

diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index e56ec98a232..e907fdfc570 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -322,6 +322,7 @@ static int reload_exec(bContext *C, wmOperator *UNUSED(op))
 	if (!clip)
 		return OPERATOR_CANCELLED;
 
+	WM_jobs_kill_type(CTX_wm_manager(C), NULL, WM_JOB_TYPE_CLIP_PREFETCH);
 	BKE_movieclip_reload(CTX_data_main(C), clip);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);



More information about the Bf-blender-cvs mailing list