From b36a05bb7e794335e3415594c41d3986cdc815e8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 10 Jan 2010 20:01:13 +0000 Subject: - fix for crash if drivers were used in the .B.blend - fix for problem where proxy objects could enter editmode but not exit --- source/blender/editors/object/object_edit.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/editors/object/object_edit.c') diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 9ef1fafff82..54fa3f51eb6 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -499,6 +499,10 @@ static int editmode_toggle_poll(bContext *C) { Object *ob = CTX_data_active_object(C); + /* covers proxies too */ + if(ob->data==NULL || ((ID *)ob->data)->lib) + return 0; + return ob && (ob->type == OB_MESH || ob->type == OB_ARMATURE || ob->type == OB_FONT || ob->type == OB_MBALL || ob->type == OB_LATTICE || ob->type == OB_SURF || -- cgit v1.2.3