[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20033] branches/blender2.5/blender/source /blender/editors/interface/interface_widgets.c: Fix for Bug #18658: | character in buttons allowing text input was being interpreted as the " menu-name | hotkey" delimeter used for menus, giving incorrect results.

[Joshua Leung]

Revision: 20033
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20033
Author:   aligorith
Date:     2009-05-03 04:27:36 +0200 (Sun, 03 May 2009)

Log Message:
-----------
Fix for Bug #18658: | character in buttons allowing text input was being interpreted as the "menu-name | hotkey" delimeter used for menus, giving incorrect results. 

This commit fixes the issue in 2.5 only. A similar fix will need to be backported/coded for trunk?

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-05-02 21:11:48 UTC (rev 20032)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-05-03 02:27:36 UTC (rev 20033)
@@ -735,15 +735,17 @@
 static void widget_draw_text(uiFontStyle *fstyle, uiBut *but, rcti *rect)
 {
 //	int transopts;
-	char *cpoin;
+	char *cpoin = NULL;
 	
 //	ui_rasterpos_safe(x, y, but->aspect);
 //	if(but->type==IDPOIN) transopts= 0;	// no translation, of course!
 //	else transopts= ui_translate_buttons();
 	
-	/* cut string in 2 parts */
-	cpoin= strchr(but->drawstr, '|');
-	if(cpoin) *cpoin= 0;		
+	/* cut string in 2 parts - only for menu entries */
+	if(ELEM5(but->type, SLI, NUM, TEX, NUMSLI, NUMABS)==0) {
+		cpoin= strchr(but->drawstr, '|');
+		if(cpoin) *cpoin= 0;		
+	}
 	
 	if(but->editstr || (but->flag & UI_TEXT_LEFT))
 		fstyle->align= UI_STYLE_TEXT_LEFT;