diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-10 23:01:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-10 23:01:13 +0300 |
| commit | b36a05bb7e794335e3415594c41d3986cdc815e8 (patch) | |
| tree | f6a3e9f13a6941b764d01d0c6b1e40df8198c6ea /source/blender/editors/object/object_edit.c | |
| parent | 0bd98195a1d67ce741145a39147cf8272708f5a2 (diff) | |
- fix for crash if drivers were used in the .B.blend
- fix for problem where proxy objects could enter editmode but not exit
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 || |