diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-08-23 15:03:48 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-08-23 15:03:48 +0400 |
| commit | 9993a652b150a0a23bf527dbf12100f5b8cd1955 (patch) | |
| tree | 375c215660daeee38c19f950c1bfb8ecc0ae6306 /source/blender/editors/space_outliner | |
| parent | 1a067c668c07d47ff6baaf8e05a931dad66ac615 (diff) | |
Patch #23460: Fix for Outliner; excludes expand button from renaming an object
Submitted by: Alexander Kuznetsov (alexk)
Ctrl-LMB or Double-Click over the expand buttons in the Outliner would try renaming the object/item, but in 2.4x this only happened over the name.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 3865fd213b4..16021e0f909 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -2402,7 +2402,7 @@ static int do_outliner_item_activate(bContext *C, Scene *scene, ARegion *ar, Spa return 1; } /* name and first icon */ - else if(mval[0]>te->xs && mval[0]<te->xend) { + else if(mval[0]>te->xs+OL_X && mval[0]<te->xend) { /* always makes active object */ if(tselem->type!=TSE_SEQUENCE && tselem->type!=TSE_SEQ_STRIP && tselem->type!=TSE_SEQUENCE_DUP) @@ -2599,7 +2599,7 @@ static int do_outliner_item_rename(bContext *C, ARegion *ar, SpaceOops *soops, T TreeStoreElem *tselem= TREESTORE(te); /* name and first icon */ - if(mval[0]>te->xs && mval[0]<te->xend) { + if(mval[0]>te->xs+OL_X && mval[0]<te->xend) { /* can't rename rna datablocks entries */ if(ELEM3(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM)) |