[Bf-blender-cvs] [683dc71c3c2] master: UI: Improve Text on 'Color Grid' Image

Yevgeny Makarov noreply at git.blender.org
Wed Oct 28 17:04:41 CET 2020


Commit: 683dc71c3c2db491ef79262bdaef495dfe01cf04
Author: Yevgeny Makarov
Date:   Wed Oct 28 09:03:42 2020 -0700
Branches: master
https://developer.blender.org/rB683dc71c3c2db491ef79262bdaef495dfe01cf04

UI: Improve Text on 'Color Grid' Image

Change the sequence of characters shown on the 'Color Grid' generated image.

Differential Revision: https://developer.blender.org/D8603

Reviewed by Hans Goudey

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

M	source/blender/blenkernel/intern/image_gen.c

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

diff --git a/source/blender/blenkernel/intern/image_gen.c b/source/blender/blenkernel/intern/image_gen.c
index 877747a257e..ceb13c4955e 100644
--- a/source/blender/blenkernel/intern/image_gen.c
+++ b/source/blender/blenkernel/intern/image_gen.c
@@ -379,10 +379,16 @@ static void checker_board_text(
   const float text_color[4] = {0.0, 0.0, 0.0, 1.0};
   const float text_outline[4] = {1.0, 1.0, 1.0, 1.0};
 
+  const char char_array[36] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+  int first_char_index = 0;
   for (y = 0; y < height; y += step) {
-    text[1] = '1';
+    text[0] = char_array[first_char_index];
 
+    int second_char_index = 27;
     for (x = 0; x < width; x += step) {
+      text[1] = char_array[second_char_index];
+
       /* hard coded offset */
       pen_x = x + 33;
       pen_y = y + 44;
@@ -412,9 +418,9 @@ static void checker_board_text(
       BLF_position(mono, pen_x, pen_y, 0.0);
       BLF_draw_buffer(mono, text, 2);
 
-      text[1]++;
+      second_char_index = (second_char_index + 1) % ARRAY_SIZE(char_array);
     }
-    text[0]++;
+    first_char_index = (first_char_index + 1) % ARRAY_SIZE(char_array);
   }
 
   /* cleanup the buffer. */



More information about the Bf-blender-cvs mailing list