Revision: 36015
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36015
Author: campbellbarton
Date: 2011-04-05 07:13:23 +0000 (Tue, 05 Apr 2011)
Log Message:
-----------
Commit r33378 adds a red alert to search buttons which have items which are not
in the list.
Disable this for pointer buttons since this was intended for vgroups & uvlayers.
Pointer buttons often reference ID's which can be in the 1000+, lookups like
this on each button draw is not useful since invalid pointers here will likely
crash on scene evaluation.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=33378
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_regions.c
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c
2011-04-05 06:05:55 UTC (rev 36014)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c
2011-04-05 07:13:23 UTC (rev 36015)
@@ -1091,9 +1091,17 @@
/* XXX weak: search_func adds all partial matches... */
void ui_but_search_test(uiBut *but)
{
- uiSearchItems *items= MEM_callocN(sizeof(uiSearchItems), "search
items");
+ uiSearchItems *items;
int x1;
-
+
+ /* possibly very large lists (such as ID datablocks) only
+ * only validate string RNA buts (not pointers) */
+ if(but->rnaprop && RNA_property_type(but->rnaprop) != PROP_STRING) {
+ return;
+ }
+
+ items= MEM_callocN(sizeof(uiSearchItems), "search items");
+
/* setup search struct */
items->maxitem= 10;
items->maxstrlen= 256;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
