Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-05-02 08:16:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-02 08:16:41 +0400
commit479b330ac5b33ee12f4c3c683b6888ed709b9b81 (patch)
tree821e02bb6c72fcd4c3e781ca6e4a11a73faf12cc /source/blender/editors/interface/interface_layout.c
parent0fadb7e47968b73189ea11d832be582a63fda1e6 (diff)
don't show an 'X' next to never-null pointer search menus.
also set ShapeKey.relative_key to never-null.
Diffstat (limited to 'source/blender/editors/interface/interface_layout.c')
-rw-r--r--source/blender/editors/interface/interface_layout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index dd6479bff71..f781da1b810 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1411,7 +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)
+ if (RNA_property_flag(prop) & (PROP_NEVER_UNLINK | PROP_NEVER_NULL))
but->type = SEARCH_MENU;
else
but->type = SEARCH_MENU_UNLINK;