diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-03 01:27:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-03 01:27:19 +0400 |
| commit | 91ba6c9ced2a95105fab8616ba6c41a55e1b4b1f (patch) | |
| tree | 70b601cbb79092079c4376ebdb211d0d114e8655 /source/blender/editors/interface/interface_layout.c | |
| parent | fe208a895a39c398e114779ca4c8c2a01adf676d (diff) | |
adjustment to own commit r56463.
when strings use 'PROP_NEVER_NULL' we still want them to show an unlink button.
Diffstat (limited to 'source/blender/editors/interface/interface_layout.c')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index f781da1b810..c66ca75412f 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1411,11 +1411,7 @@ void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRN /* turn button into search button */ if (searchprop) { - if (RNA_property_flag(prop) & (PROP_NEVER_UNLINK | PROP_NEVER_NULL)) - but->type = SEARCH_MENU; - else - but->type = SEARCH_MENU_UNLINK; - + but->type = RNA_property_is_unlink(prop) ? SEARCH_MENU_UNLINK : SEARCH_MENU; but->hardmax = MAX2(but->hardmax, 256.0f); but->rnasearchpoin = *searchptr; but->rnasearchprop = searchprop; |