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.
This commit is contained in:
parent
1a067c668c
commit
9993a652b1
@ -2402,7 +2402,7 @@ static int do_outliner_item_activate(bContext *C, Scene *scene, ARegion *ar, Spa
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
/* name and first icon */
|
/* 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 */
|
/* always makes active object */
|
||||||
if(tselem->type!=TSE_SEQUENCE && tselem->type!=TSE_SEQ_STRIP && tselem->type!=TSE_SEQUENCE_DUP)
|
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);
|
TreeStoreElem *tselem= TREESTORE(te);
|
||||||
|
|
||||||
/* name and first icon */
|
/* 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 */
|
/* can't rename rna datablocks entries */
|
||||||
if(ELEM3(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM))
|
if(ELEM3(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM))
|
||||||
|
Loading…
Reference in New Issue
Block a user