Added an icon for new sculpt colors boundary smooth tool

intern/ghost/intern/GHOST_WindowWin32.cpp

@@ -58,6 +58,38 @@ extern "C" {
 __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
 }
 
+#include <thread>
+static void thread_cb(
+    GHOST_WIN32_WTInfo info, unsigned int a, unsigned int b, void *dest, int *status, int *ret)
+{
+  *ret = info(a, b, dest);
+  *status = 1;
+}
+
+static unsigned int call_wt_info(GHOST_WIN32_WTInfo info,
+                                 unsigned int a,
+                                 unsigned int b,
+                                 void *dest)
+{
+  static int status = 0;
+  static int ret = 0;
+
+  std::thread thread(thread_cb, info, a, b, dest, &status, &ret);
+
+  std::this_thread::sleep_for(std::chrono::milliseconds(750));
+
+  if (!status) {
+    fprintf(stderr, "failed to initialize wintab properly\n");
+    thread.detach();
+    return 0;
+  }
+  else {
+    thread.join();
+  }
+
+  return ret;
+}
+
 GHOST_WindowWin32::GHOST_WindowWin32(GHOST_SystemWin32 *system,
                                      const char *title,
                                      GHOST_TInt32 left,
@@ -1032,7 +1064,7 @@ void GHOST_WindowWin32::initializeWintab()
   /* Check if WinTab available by getting system context info. */
   LOGCONTEXT lc = {0};
   if (m_wintab.open && m_wintab.info && m_wintab.queueSizeGet && m_wintab.queueSizeSet &&
-      m_wintab.info(WTI_DEFSYSCTX, 0, &lc)) {
+      call_wt_info(m_wintab.info, WTI_DEFSYSCTX, 0, &lc)) {
 
     /* The pressure and orientation (tilt) */
     AXIS Pressure, Orientation[3];

release/datafiles/locale

@@ -1 +1 @@
-Subproject commit 8f5a0e027f131104974763d30db36b1a9ffae16a
+Subproject commit 975b889271128f712fbdc4b509605cc1094fcde4

release/scripts/addons

@@ -1 +1 @@
-Subproject commit a1f229202345c5e705f3035e2ff418bc3a9fe669
+Subproject commit 5a1e3d5023c0605885d7de52856ad97114dbd35f

source/blender/editors/datafiles/CMakeLists.txt

@@ -666,6 +666,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   brush.sculpt.snake_hook
   brush.sculpt.thumb
   brush.sculpt.topology
+  brush.sculpt.vcol_boundary
   brush.uv_sculpt.grab
   brush.uv_sculpt.pinch
   brush.uv_sculpt.relax

source/blender/editors/include/UI_icons.h

@@ -919,6 +919,7 @@ DEF_ICON_COLOR(BRUSH_TEXFILL)
 DEF_ICON_COLOR(BRUSH_TEXMASK)
 DEF_ICON_COLOR(BRUSH_THUMB)
 DEF_ICON_COLOR(BRUSH_ROTATE)
+DEF_ICON_COLOR(BRUSH_VCOL_BOUNDARY)
 
 /* grease pencil sculpt */
 DEF_ICON_COLOR(GPBRUSH_SMOOTH)

source/blender/makesrna/intern/rna_brush.c

@@ -136,7 +136,7 @@ const EnumPropertyItem rna_enum_brush_sculpt_tool_items[] = {
     {SCULPT_TOOL_PAINT, "PAINT", ICON_BRUSH_SCULPT_DRAW, "Paint", ""},
     {SCULPT_TOOL_SMEAR, "SMEAR", ICON_BRUSH_SCULPT_DRAW, "Smear", ""},
     {SCULPT_TOOL_DRAW_FACE_SETS, "DRAW_FACE_SETS", ICON_BRUSH_MASK, "Draw Face Sets", ""},
-    {SCULPT_TOOL_VCOL_BOUNDARY, "VCOL_BOUNDARY", ICON_BRUSH_MASK, "Color Boundary", ""},
+    {SCULPT_TOOL_VCOL_BOUNDARY, "VCOL_BOUNDARY", ICON_BRUSH_VCOL_BOUNDARY, "Color Boundary", ""},
         {0, NULL, 0, NULL, NULL},
 };
 /* clang-format on */

source/tools

@@ -1 +1 @@
-Subproject commit 7011d02c292ac1c91a5c9cc1a075ea2727982cee
+Subproject commit 06cbc0b66f307c825405c7ad5d444d8275afef3e