From b757e5c944a37d1698cf73d2a973940c8efe5a3e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 26 Apr 2010 10:12:03 +0000 Subject: Fix #22086 and #22125: crashes due to editmode being set on load/undo, fixes are simple enough, though may still revert this feature if it turns out there are more problems. --- source/blender/blenloader/intern/readfile.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 71c09917c46..f7dcbee79be 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3897,6 +3897,11 @@ static void direct_link_object(FileData *fd, Object *ob) /* weak weak... this was only meant as draw flag, now is used in give_base too */ ob->flag &= ~OB_FROMGROUP; + + /* loading saved files with editmode enabled works, but for undo we like + to stay in object mode during undo presses so keep editmode disabled */ + if(fd->memfile) + ob->mode &= ~(OB_MODE_EDIT|OB_MODE_PARTICLE_EDIT); ob->disp.first=ob->disp.last= NULL; -- cgit v1.2.3