[Bf-blender-cvs] [cb62095c1c8] master: Correct error with IME from d6fef73ef110eb43756b7b87c2cba80abae3b39f

Campbell Barton noreply at git.blender.org
Thu Jul 14 12:07:50 CEST 2022


Commit: cb62095c1c8afc4e2b5f28904e3ac4cbd47503b2
Author: Campbell Barton
Date:   Thu Jul 14 20:07:06 2022 +1000
Branches: master
https://developer.blender.org/rBcb62095c1c8afc4e2b5f28904e3ac4cbd47503b2

Correct error with IME from d6fef73ef110eb43756b7b87c2cba80abae3b39f

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 2ad2cd15c43..2496136883d 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -3172,6 +3172,13 @@ static bool ui_textedit_insert_buf(uiBut *but,
   return changed;
 }
 
+static bool ui_textedit_insert_ascii(uiBut *but, uiHandleButtonData *data, const char ascii)
+{
+  BLI_assert(isascii(ascii));
+  const char buf[2] = {ascii, '\0'};
+  return ui_textedit_insert_buf(but, data, buf, sizeof(buf) - 1);
+}
+
 static void ui_textedit_move(uiBut *but,
                              uiHandleButtonData *data,
                              eStrCursorJumpDirection direction,
@@ -3934,6 +3941,9 @@ static void ui_do_but_textedit(
   else if (event->type == WM_IME_COMPOSITE_END) {
     changed = true;
   }
+#else
+  /* Prevent the function from being unused. */
+  (void)ui_textedit_insert_ascii;
 #endif
 
   if (changed) {



More information about the Bf-blender-cvs mailing list