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:59:52 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-02 08:59:52 +0400
commitd5b36bf0274da3139d283f5ebb29d6ed345685de (patch)
tree46ee9c0115796385088cef872ed16d4ad427acad /source/blender/editors/interface/interface_handlers.c
parente2e1b0d20dc6673cf75170e01b233789de86037b (diff)
fix [#35178] Autoselect-in-list for Vertex Group selection doesn't work.
disallow assigning values that don't exist into a text field with a search-box.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
-rw-r--r--source/blender/editors/interface/interface_handlers.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index bd3ded01780..e8fcd7a0f40 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2056,8 +2056,13 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
}
if (data->searchbox) {
- if (data->cancel == false)
- ui_searchbox_apply(but, data->searchbox);
+ if (data->cancel == false) {
+ if ((ui_searchbox_apply(but, data->searchbox) == false) ||
+ (ui_searchbox_find_index(data->searchbox, but->editstr) == -1))
+ {
+ data->cancel = true;
+ }
+ }
ui_searchbox_free(C, data->searchbox);
data->searchbox = NULL;