[Bf-blender-cvs] [2081b95347e] usd-importer-T81257-merge: USD Importer: dependency graph update crash.

[makowalski]

Commit: 2081b95347ea325c6b566986bf054a8b15764f13
Author: makowalski
Date:   Wed Feb 17 11:24:23 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB2081b95347ea325c6b566986bf054a8b15764f13

USD Importer: dependency graph update crash.

Fixed occasional random crash due to simultaneous update
to the dependency graph from multiple threads. A typical
collision might happen when the USD import job thread
is creating a material while the window manager in the
main thread is processing event notifiers.  The current
fix is to remove the ND_FRAME flag from the call to
WM_jobs_timer(), which prevents ED_update_for_newframe()
from being called from wm_event_do_notifiers().

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

M	source/blender/io/usd/intern/usd_capi.cc

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

diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index ad2adac2e40..e808cba4c64 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -609,7 +609,7 @@ bool USD_import(struct bContext *C,
 
     /* setup job */
     WM_jobs_customdata_set(wm_job, job, import_freejob);
-    WM_jobs_timer(wm_job, 0.1, NC_SCENE | ND_FRAME, NC_SCENE | ND_FRAME);
+    WM_jobs_timer(wm_job, 0.1, NC_SCENE, NC_SCENE);
     WM_jobs_callbacks(wm_job, import_startjob, NULL, NULL, import_endjob);
 
     WM_jobs_start(CTX_wm_manager(C), wm_job);