[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22022] branches/blender2.5/blender/source /blender/editors: 2.5

[Ton Roosendaal]

Revision: 22022
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22022
Author:   ton
Date:     2009-07-29 20:15:46 +0200 (Wed, 29 Jul 2009)

Log Message:
-----------
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

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
    branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c
    branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-07-29 18:04:35 UTC (rev 22021)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-07-29 18:15:46 UTC (rev 22022)
@@ -748,12 +748,14 @@
 {
 	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)

Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c	2009-07-29 18:04:35 UTC (rev 22021)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c	2009-07-29 18:15:46 UTC (rev 22022)
@@ -723,7 +723,7 @@
 	ot->modal= WM_gesture_lines_modal;
 	ot->exec= knife_cut_exec;
 	
-	ot->poll= ED_operator_editmesh;
+	ot->poll= EM_view3d_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;

Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c	2009-07-29 18:04:35 UTC (rev 22021)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c	2009-07-29 18:15:46 UTC (rev 22022)
@@ -933,7 +933,7 @@
 	SpaceFile *sfile= CTX_wm_space_file(C);
 	struct direntry* file;
 
-	if (sfile->params) {
+	if (sfile && sfile->params) {
 		if (sfile->params->active_file < 0) { 
 			poll= 0;
 		} else {