diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-01-05 21:12:54 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-01-05 21:12:54 +0300 |
| commit | 979742241fc1fe9825e5df1abd43081ebd959a98 (patch) | |
| tree | 766682dcad71fffe6b8833f9d256f7ba18b571b2 /source/blender/editors/object | |
| parent | 37931a6b1a9931c8eeb8a7dcd3ea79ed50a86064 (diff) | |
Bugfix, irc report:
Outliner: using the object-data icons to enter editmode, didn't
reset the toolbar Operator redo. It was not using an operator
call here. Note to self: more outliner tools don't...
Error was that operator-redo then would repeat an action incorrect.
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 78163fa4e1d..e8da5118532 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -523,6 +523,9 @@ static int editmode_toggle_poll(bContext *C) /* covers proxies too */ if(ELEM(NULL, ob, ob->data) || ((ID *)ob->data)->lib) return 0; + + if (ob && (ob->restrictflag & OB_RESTRICT_VIEW)) + return 0; return ob && (ob->type == OB_MESH || ob->type == OB_ARMATURE || ob->type == OB_FONT || ob->type == OB_MBALL || |