blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Alembic import: lock interface while importing 

This prevents crashes caused by the viewport evaluating the depsgraph while
the import is still running.
This commit is contained in:
Sybren A. Stüvel 2018-12-28 16:40:08 +01:00
parent c509507714
commit da7a342478
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/alembic/intern/alembic_capi.cc
View File

@ -632,6 +632,7 @@ struct ImportJobData {
Main *bmain;
Scene *scene;
ViewLayer *view_layer;
wmWindowManager *wm;
char filename[1024];
ImportSettings settings;
@ -657,6 +658,8 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
data->do_update = do_update;
data->progress = progress;
WM_set_locked_interface(data->wm, true);
ArchiveReader *archive = new ArchiveReader(data->filename);
if (!archive->valid()) {
@ -836,6 +839,8 @@ static void import_endjob(void *user_data)
}
}
WM_set_locked_interface(data->wm, false);
switch (data->error_code) {
default:
case ABC_NO_ERROR:
@ -868,6 +873,7 @@ bool ABC_import(bContext *C, const char *filepath, float scale, bool is_sequence
job->bmain = CTX_data_main(C);
job->scene = CTX_data_scene(C);
job->view_layer = CTX_data_view_layer(C);
job->wm = CTX_wm_manager(C);
job->import_ok = false;
BLI_strncpy(job->filename, filepath, 1024);