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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-01-31 17:44:13 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-01-31 17:44:13 +0400
commitba7e37c2b6ea87c08dac697257360edcea2ae8f4 (patch)
treeb1e35b011cf08ed242dae158c63f1acd039bd10e /source/blender/editors/interface/interface_layout.c
parent122a2084b5c056befb6627a1d12ee337f0fe07fe (diff)
Fix #33874: active UV map chooser in uv editor should not have X button as you
can't not have an active UV map.
Diffstat (limited to 'source/blender/editors/interface/interface_layout.c')
-rw-r--r--source/blender/editors/interface/interface_layout.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 10375824518..487277ed0a9 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1393,7 +1393,11 @@ void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRN
/* turn button into search button */
if (searchprop) {
- but->type = SEARCH_MENU_UNLINK;
+ if(RNA_property_flag(prop) & PROP_NEVER_UNLINK)
+ but->type = SEARCH_MENU;
+ else
+ but->type = SEARCH_MENU_UNLINK;
+
but->hardmax = MAX2(but->hardmax, 256.0f);
but->rnasearchpoin = *searchptr;
but->rnasearchprop = searchprop;