archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix multi-object edit state on load

Browse Source 
Objects selected on save would enter edit-mode on file load.
This commit is contained in:
Campbell Barton
2018-12-06 17:52:21 +11:00
parent aeffaf75ab
commit 285b06da51
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/util/ed_util.c
View File

@@ -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);