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-04 02:43:02 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-04 02:43:02 +0400
commitc6561745788811851049f333c06699202d47898f (patch)
treef4d5f706462554cdc1e33d306418cb94c1e01894
parent838949c3e76eb140bb0f776fbbd0fd61fac08f49 (diff)
fix for mistake in own recent commit, broke operator search (r56465).
-rw-r--r--source/blender/editors/interface/interface_handlers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index b9648a483fe..3ad721eaa75 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2057,7 +2057,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
if (data->searchbox) {
if (data->cancel == false) {
- if ((ui_searchbox_apply(but, data->searchbox) == false) ||
+ if ((ui_searchbox_apply(but, data->searchbox) == false) &&
(ui_searchbox_find_index(data->searchbox, but->editstr) == -1))
{
data->cancel = true;