Commit: 552ae648e5d3bc0e46ca54d16a31bdc32f58a4bd
Author: Campbell Barton
Date: Sat Dec 6 12:16:20 2014 +0100
Branches: input_method_editor_partial_support
https://developer.blender.org/rB552ae648e5d3bc0e46ca54d16a31bdc32f58a4bd
Merge branch 'master' into input_method_editor_partial_support
===================================================================
===================================================================
diff --cc source/blender/editors/interface/interface_widgets.c
index 13d8cb8,c9def07..84927af
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -1281,11 -1235,9 +1281,10 @@@ static void widget_draw_text_ime_underl
static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut
*but, rcti *rect)
{
int drawstr_left_len = UI_MAX_DRAW_STR;
- const char *drawstr = but->drawstr;
+ char *drawstr = but->drawstr;
const char *drawstr_right = NULL;
- char *drawstr_edit = NULL;
bool use_right_only = false;
+ wmIMEData *ime_data;
UI_fontstyle_set(fstyle);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
