[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49947] trunk/blender: fix for crash showing tooltip for NODE_OT_add_search()

[Campbell Barton]

Revision: 49947
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49947
Author:   campbellbarton
Date:     2012-08-17 11:31:54 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
fix for crash showing tooltip for NODE_OT_add_search()

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/node.py
    trunk/blender/source/blender/editors/interface/interface_intern.h
    trunk/blender/source/blender/editors/interface/interface_regions.c

Modified: trunk/blender/release/scripts/startup/bl_operators/node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/node.py	2012-08-17 08:25:23 UTC (rev 49946)
+++ trunk/blender/release/scripts/startup/bl_operators/node.py	2012-08-17 11:31:54 UTC (rev 49947)
@@ -57,10 +57,10 @@
 def node_type_items_cb(self, context):
     snode = context.space_data
     if not snode:
-        return []
+        return ()
     tree = snode.edit_tree
     if not tree:
-        return []
+        return ()
 
     # Lists of basic node types for each
     if not node_type_items_dict:
@@ -76,7 +76,7 @@
     if tree.type in node_type_items_dict:
         return node_type_items_dict[tree.type] + node_group_items(tree.type)
     else:
-        return []
+        return ()
 
 
 class NODE_OT_add_search(Operator):

Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h	2012-08-17 08:25:23 UTC (rev 49946)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h	2012-08-17 11:31:54 UTC (rev 49947)
@@ -176,7 +176,7 @@
 
 	struct bContextStore *context;
 
-	/* not ysed yet, was used in 2.4x for ui_draw_pulldown_round & friends */
+	/* not used yet, was used in 2.4x for ui_draw_pulldown_round & friends */
 #if 0
 	void (*embossfunc)(int, int, float, float, float, float, float, int);
 	void (*sliderfunc)(int, float, float, float, float, float, float, int);

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2012-08-17 08:25:23 UTC (rev 49946)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2012-08-17 11:31:54 UTC (rev 49947)
@@ -573,6 +573,9 @@
 		char *str;
 		opptr = uiButGetOperatorPtrRNA(but); /* allocated when needed, the button owns it */
 
+		/* so the context is passed to itemf functions (some py itemf functions use it) */
+		WM_operator_properties_sanitize(opptr, FALSE);
+
 		str = WM_operator_pystring(C, but->optype, opptr, 0);
 
 		/* operator info */