[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61009] trunk/blender/source/blender/ editors/interface/interface_handlers.c: revert own commit r60607, caused bug [#37253]

Campbell Barton ideasman42 at gmail.com
Wed Oct 30 12:32:31 CET 2013


Revision: 61009
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61009
Author:   campbellbarton
Date:     2013-10-30 11:32:30 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
revert own commit r60607, caused bug [#37253]

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60607

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-30 11:21:31 UTC (rev 61008)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-10-30 11:32:30 UTC (rev 61009)
@@ -2730,9 +2730,14 @@
 		
 		rect.xmin = rect.xmax - (BLI_rcti_size_y(&rect));
 		if (BLI_rcti_isect_pt(&rect, x, y)) {
-			ui_set_but_string(C, but, "");
+			/* most likely NULL, but let's check, and give it temp zero string */
+			if (data->str == NULL)
+				data->str = MEM_callocN(1, "temp str");
+			data->str[0] = 0;
+
+			ui_apply_but_TEX(C, but, data);
 			button_activate_state(C, but, BUTTON_STATE_EXIT);
-			
+
 			return WM_UI_HANDLER_BREAK;
 		}
 	}




More information about the Bf-blender-cvs mailing list