[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41887] trunk/blender/source/blender/ editors/interface/interface_layout.c: Fix for #29165 bugfix: adding nodes from shift+A menu in node editor did nothing.

[Brecht Van Lommel]

Revision: 41887
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41887
Author:   blendix
Date:     2011-11-15 18:24:17 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
Fix for #29165 bugfix: adding nodes from shift+A menu in node editor did nothing.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_layout.c

Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c	2011-11-15 18:01:52 UTC (rev 41886)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c	2011-11-15 18:24:17 UTC (rev 41887)
@@ -1492,11 +1492,11 @@
 	w= ui_text_icon_width(layout, name, icon, 0);
 
 	if(icon && name[0])
-		uiDefIconTextButF(block, BUT, 0, icon, name, 0, 0, w, UI_UNIT_Y, retvalue, 0.0, 0.0, 0, argval, "");
+		uiDefIconTextButF(block, BUT, argval, icon, name, 0, 0, w, UI_UNIT_Y, retvalue, 0.0, 0.0, 0, 0, "");
 	else if(icon)
-		uiDefIconButF(block, BUT, 0, icon, 0, 0, w, UI_UNIT_Y, retvalue, 0.0, 0.0, 0, argval, "");
+		uiDefIconButF(block, BUT, argval, icon, 0, 0, w, UI_UNIT_Y, retvalue, 0.0, 0.0, 0, 0, "");
 	else
-		uiDefButF(block, BUT, 0, name, 0, 0, w, UI_UNIT_Y, retvalue, 0.0, 0.0, 0, argval, "");
+		uiDefButF(block, BUT, argval, name, 0, 0, w, UI_UNIT_Y, retvalue, 0.0, 0.0, 0, 0, "");
 }
 
 /* separator item */
@@ -2517,7 +2517,7 @@
 static void ui_layout_end(uiBlock *block, uiLayout *layout, int *x, int *y)
 {
 	if(layout->root->handlefunc)
-		uiBlockSetButmFunc(block, layout->root->handlefunc, layout->root->argv);
+		uiBlockSetHandleFunc(block, layout->root->handlefunc, layout->root->argv);
 
 	ui_item_estimate(&layout->item);
 	ui_item_layout(&layout->item);