[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60607] trunk/blender/source/blender/ editors/interface/interface_handlers.c: avoid allocating a dummy string for the unlink button.

[Campbell Barton]

Revision: 60607
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60607
Author:   campbellbarton
Date:     2013-10-08 13:10:22 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
avoid allocating a dummy string for the unlink button.

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

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-10-08 13:07:09 UTC (rev 60606)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-10-08 13:10:22 UTC (rev 60607)
@@ -2658,13 +2658,8 @@
 		BLI_rcti_rctf_copy(&rect, &but->rect);
 		
 		rect.xmin = rect.xmax - (BLI_rcti_size_y(&rect));
-		if ( BLI_rcti_isect_pt(&rect, x, y) ) {
-			/* most likely NULL, but let's check, and give it temp zero string */
-			if (data->str == NULL)
-				data->str = MEM_callocN(16, "temp str");
-			data->str[0] = 0;
-			
-			ui_apply_but_TEX(C, but, data);
+		if (BLI_rcti_isect_pt(&rect, x, y)) {
+			ui_set_but_string(C, but, "");
 			button_activate_state(C, but, BUTTON_STATE_EXIT);
 			
 			return WM_UI_HANDLER_BREAK;