diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-01-30 20:03:01 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-01-30 20:03:01 +0300 |
| commit | cc8fc516361314e2c3d9f4d9526961154c3409d9 (patch) | |
| tree | 04a119d718e574b82b7b821c2f87eff840f91949 /source/blender/editors/space_outliner/outliner.c | |
| parent | 1b28e8c162d4ebcb480e89461e5d93356792970d (diff) | |
Bugfix #25859
Outliner: click on 'restrict' options also selected/deselected the
item itself. Fix provided by Alexander Kuznetsov. Thanks!
Diffstat (limited to 'source/blender/editors/space_outliner/outliner.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 466eaa4c6e9..b29664a09a5 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -2560,9 +2560,12 @@ static int outliner_item_activate(bContext *C, wmOperator *op, wmEvent *event) TreeElement *te; float fmval[2]; int extend= RNA_boolean_get(op->ptr, "extend"); - + UI_view2d_region_to_view(&ar->v2d, event->x - ar->winrct.xmin, event->y - ar->winrct.ymin, fmval, fmval+1); - + + if(!ELEM3(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF, SO_KEYMAP) && !(soops->flag & SO_HIDE_RESTRICTCOLS) && fmval[0] > ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX) + return OPERATOR_CANCELLED; + for(te= soops->tree.first; te; te= te->next) { if(do_outliner_item_activate(C, scene, ar, soops, te, extend, fmval)) break; } |