diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-06 09:52:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-06 09:53:59 +0300 |
| commit | 285b06da515d18c19f5674091fad60f7b3d52be3 (patch) | |
| tree | 1a42d0b6cad5db1319d80cc4d841a4643eef4231 /source/blender/editors/util/ed_util.c | |
| parent | aeffaf75aba037271e843373a52a8022dceece65 (diff) | |
Fix multi-object edit state on load
Objects selected on save would enter edit-mode on file load.
Diffstat (limited to 'source/blender/editors/util/ed_util.c')
| -rw-r--r-- | source/blender/editors/util/ed_util.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index f316b1a61cb..8de46442fe9 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -91,6 +91,7 @@ void ED_editors_init(bContext *C) { Main *bmain = CTX_data_main(C); + Scene *scene = CTX_data_scene(C); wmWindowManager *wm = CTX_wm_manager(C); if (wm->undo_stack == NULL) { @@ -122,7 +123,15 @@ void ED_editors_init(bContext *C) ID *data = ob->data; ob->mode = OB_MODE_OBJECT; if ((ob == obact) && !ID_IS_LINKED(ob) && !(data && ID_IS_LINKED(data))) { - ED_object_mode_toggle(C, mode); + if (mode == OB_MODE_EDIT) { + ED_object_editmode_enter_ex(bmain, scene, ob, 0); + } + else if (mode == OB_MODE_POSE) { + ED_object_posemode_enter_ex(bmain, ob); + } + else { + ED_object_mode_toggle(C, mode); + } } } } @@ -130,11 +139,8 @@ void ED_editors_init(bContext *C) } /* image editor paint mode */ - { - Scene *sce = CTX_data_scene(C); - if (sce) { - ED_space_image_paint_update(bmain, wm, sce); - } + if (scene) { + ED_space_image_paint_update(bmain, wm, scene); } SWAP(int, reports->flag, reports_flag_prev); |