diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-16 06:16:21 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-16 06:35:37 +0300 |
commit | 3692a2bcb3b8f742551c791c6e484e01678a0835 (patch) | |
tree | d9953d66c88c504aaf7967da9ecadf1eea2d2d6d /source/blender/editors/io | |
parent | cca1e1b707c2d34244d3da87efcd78775c4eb048 (diff) | |
parent | e5327afcb73f102db8a82ccefc29bbf9cc6fb60c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/io')
-rw-r--r-- | source/blender/editors/io/io_alembic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c index ca4ab30a08d..b584782e183 100644 --- a/source/blender/editors/io/io_alembic.c +++ b/source/blender/editors/io/io_alembic.c @@ -59,6 +59,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" +#include "ED_object.h" + #include "UI_interface.h" #include "UI_resources.h" @@ -543,6 +545,12 @@ static int wm_alembic_import_exec(bContext *C, wmOperator *op) } } + /* Switch out of edit mode to avoid being stuck in it (T54326). */ + Object *obedit = CTX_data_edit_object(C); + if (obedit) { + ED_object_mode_toggle(C, OB_MODE_EDIT); + } + bool ok = ABC_import(C, filename, scale, is_sequence, set_frame_range, sequence_len, offset, validate_meshes, as_background_job); |