2.5

Two bugfixes, reported by Sebastian Skejo in IRC:

- File operator poll wasn't secure, search for it crashed
- Knife tool depends on having view3d context, fixed poll for it

1 files changed, 6 insertions, 4 deletions

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 70716de6bdc..7cce7a0bbed 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -748,12 +748,14 @@ void ui_searchbox_autocomplete(bContext *C, ARegion *ar, uiBut *but, char *str)
 {
 	uiSearchboxData *data= ar->regiondata;
 
-	data->items.autocpl= autocomplete_begin(str, ui_get_but_string_max_length(but));
+	if(str[0]) {
+		data->items.autocpl= autocomplete_begin(str, ui_get_but_string_max_length(but));
 
-	but->search_func(C, but->search_arg, but->editstr, &data->items);
+		but->search_func(C, but->search_arg, but->editstr, &data->items);
 
-	autocomplete_end(data->items.autocpl, str);
-	data->items.autocpl= NULL;
+		autocomplete_end(data->items.autocpl, str);
+		data->items.autocpl= NULL;
+	}
 }
 
 static void ui_searchbox_region_draw(const bContext *C, ARegion *ar)