[Bf-blender-cvs] [91a5e1aef82] temp_bmesh_multires: Added an icon for new sculpt colors boundary smooth tool

Joseph Eagar noreply at git.blender.org
Wed Nov 4 11:34:38 CET 2020 

Commit: 91a5e1aef82da7da401f252eab526ccfa3d1b26e
Author: Joseph Eagar
Date:   Wed Nov 4 02:34:18 2020 -0800
Branches: temp_bmesh_multires
https://developer.blender.org/rB91a5e1aef82da7da401f252eab526ccfa3d1b26e

Added an icon for new sculpt colors boundary smooth tool

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

M	intern/ghost/intern/GHOST_WindowWin32.cpp
M	release/datafiles/icons/brush.gpencil_draw.tint.dat
M	release/datafiles/icons/brush.paint_vertex.replace.dat
M	release/datafiles/icons/brush.sculpt.blob.dat
M	release/datafiles/icons/brush.sculpt.boundary.dat
M	release/datafiles/icons/brush.sculpt.clay.dat
M	release/datafiles/icons/brush.sculpt.clay_strips.dat
M	release/datafiles/icons/brush.sculpt.clay_thumb.dat
M	release/datafiles/icons/brush.sculpt.crease.dat
M	release/datafiles/icons/brush.sculpt.displacement_eraser.dat
M	release/datafiles/icons/brush.sculpt.draw.dat
M	release/datafiles/icons/brush.sculpt.draw_sharp.dat
M	release/datafiles/icons/brush.sculpt.elastic_deform.dat
M	release/datafiles/icons/brush.sculpt.fill.dat
M	release/datafiles/icons/brush.sculpt.flatten.dat
M	release/datafiles/icons/brush.sculpt.grab.dat
M	release/datafiles/icons/brush.sculpt.inflate.dat
M	release/datafiles/icons/brush.sculpt.layer.dat
M	release/datafiles/icons/brush.sculpt.mask.dat
M	release/datafiles/icons/brush.sculpt.multiplane_scrape.dat
M	release/datafiles/icons/brush.sculpt.nudge.dat
M	release/datafiles/icons/brush.sculpt.pinch.dat
M	release/datafiles/icons/brush.sculpt.pose.dat
M	release/datafiles/icons/brush.sculpt.rotate.dat
M	release/datafiles/icons/brush.sculpt.scrape.dat
M	release/datafiles/icons/brush.sculpt.simplify.dat
M	release/datafiles/icons/brush.sculpt.smooth.dat
M	release/datafiles/icons/brush.sculpt.snake_hook.dat
M	release/datafiles/icons/brush.sculpt.thumb.dat
M	release/datafiles/icons/ops.sculpt.border_hide.dat
M	release/datafiles/icons/ops.sculpt.border_mask.dat
M	release/datafiles/icons/ops.sculpt.box_trim.dat
M	release/datafiles/icons/ops.sculpt.lasso_mask.dat
M	release/datafiles/icons/ops.sculpt.lasso_trim.dat
M	release/datafiles/icons/ops.sculpt.line_mask.dat
M	release/datafiles/icons/ops.sculpt.line_project.dat
M	release/datafiles/icons/ops.sculpt.mesh_filter.dat
M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/editors/datafiles/CMakeLists.txt
M	source/blender/editors/include/UI_icons.h
M	source/blender/makesrna/intern/rna_brush.c
M	source/tools

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

diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 5904a72b186..51b8ee8108f 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/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];
diff --git a/release/datafiles/icons/brush.gpencil_draw.tint.dat b/release/datafiles/icons/brush.gpencil_draw.tint.dat
index 32d8a5f04e4..9f3c6aca6bc 100644
Binary files a/release/datafiles/icons/brush.gpencil_draw.tint.dat and b/release/datafiles/icons/brush.gpencil_draw.tint.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.replace.dat b/release/datafiles/icons/brush.paint_vertex.replace.dat
index 676436548a7..75919cad907 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.replace.dat and b/release/datafiles/icons/brush.paint_vertex.replace.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.blob.dat b/release/datafiles/icons/brush.sculpt.blob.dat
index 890a73e26a6..a6daab60694 100644
Binary files a/release/datafiles/icons/brush.sculpt.blob.dat and b/release/datafiles/icons/brush.sculpt.blob.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.boundary.dat b/release/datafiles/icons/brush.sculpt.boundary.dat
index 8d56baf2254..3424f4a36c9 100644
Binary files a/release/datafiles/icons/brush.sculpt.boundary.dat and b/release/datafiles/icons/brush.sculpt.boundary.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.clay.dat b/release/datafiles/icons/brush.sculpt.clay.dat
index 8e333846499..3c9199c1d30 100644
Binary files a/release/datafiles/icons/brush.sculpt.clay.dat and b/release/datafiles/icons/brush.sculpt.clay.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.clay_strips.dat b/release/datafiles/icons/brush.sculpt.clay_strips.dat
index 8d1382d80b2..b3331664e21 100644
Binary files a/release/datafiles/icons/brush.sculpt.clay_strips.dat and b/release/datafiles/icons/brush.sculpt.clay_strips.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.clay_thumb.dat b/release/datafiles/icons/brush.sculpt.clay_thumb.dat
index b063fff9967..5d81b9ecfb9 100644
Binary files a/release/datafiles/icons/brush.sculpt.clay_thumb.dat and b/release/datafiles/icons/brush.sculpt.clay_thumb.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.crease.dat b/release/datafiles/icons/brush.sculpt.crease.dat
index 686d04ce1a7..a972f155dfb 100644
Binary files a/release/datafiles/icons/brush.sculpt.crease.dat and b/release/datafiles/icons/brush.sculpt.crease.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.displacement_eraser.dat b/release/datafiles/icons/brush.sculpt.displacement_eraser.dat
index e4637b9b12f..62091e7a8dc 100644
Binary files a/release/datafiles/icons/brush.sculpt.displacement_eraser.dat and b/release/datafiles/icons/brush.sculpt.displacement_eraser.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.draw.dat b/release/datafiles/icons/brush.sculpt.draw.dat
index 014ce10e8cc..660c8f9c920 100644
Binary files a/release/datafiles/icons/brush.sculpt.draw.dat and b/release/datafiles/icons/brush.sculpt.draw.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.draw_sharp.dat b/release/datafiles/icons/brush.sculpt.draw_sharp.dat
index 9bea1b02894..08b97d89b12 100644
Binary files a/release/datafiles/icons/brush.sculpt.draw_sharp.dat and b/release/datafiles/icons/brush.sculpt.draw_sharp.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.elastic_deform.dat b/release/datafiles/icons/brush.sculpt.elastic_deform.dat
index 0b12d717d3a..6c70aef1879 100644
Binary files a/release/datafiles/icons/brush.sculpt.elastic_deform.dat and b/release/datafiles/icons/brush.sculpt.elastic_deform.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.fill.dat b/release/datafiles/icons/brush.sculpt.fill.dat
index b2898919bd4..83de667b1f9 100644
Binary files a/release/datafiles/icons/brush.sculpt.fill.dat and b/release/datafiles/icons/brush.sculpt.fill.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.flatten.dat b/release/datafiles/icons/brush.sculpt.flatten.dat
index 25b5f0cf8a9..a8cdbed261c 100644
Binary files a/release/datafiles/icons/brush.sculpt.flatten.dat and b/release/datafiles/icons/brush.sculpt.flatten.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.grab.dat b/release/datafiles/icons/brush.sculpt.grab.dat
index 0b61977e792..279808274f3 100644
Binary files a/release/datafiles/icons/brush.sculpt.grab.dat and b/release/datafiles/icons/brush.sculpt.grab.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.inflate.dat b/release/datafiles/icons/brush.sculpt.inflate.dat
index 7e85ee23fcf..1e4885a75b1 100644
Binary files a/release/datafiles/icons/brush.sculpt.inflate.dat and b/release/datafiles/icons/brush.sculpt.inflate.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.layer.dat b/release/datafiles/icons/brush.sculpt.layer.dat
index 1031d95332a..5f5afba12a5 100644
Binary files a/release/datafiles/icons/brush.sculpt.layer.dat and b/release/datafiles/icons/brush.sculpt.layer.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.mask.dat b/release/datafiles/icons/brush.sculpt.mask.dat
index a285c4c2e8f..7650a86bc1d 100644
Binary files a/release/datafiles/icons/brush.sculpt.mask.dat and b/release/datafiles/icons/brush.sculpt.mask.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat b/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat
index b785bb51431..4451bbe7f53 100644
Binary files a/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat and b/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.nudge.dat b/release/datafiles/icons/brush.sculpt.nudge.dat
index e10157e9cd0..78dc342a3a9 100644
Binary files a/release/datafiles/icons/brush.sculpt.nudge.dat and b/release/datafiles/icons/brush.sculpt.nudge.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.pinch.dat b/release/datafiles/icons/brush.sculpt.pinch.dat
index abdb62dcfc8..6a20d8717f8 100644
Binary files a/release/datafiles/icons/brush.sculpt.pinch.dat and b/release/datafiles/icons/brush.sculpt.pinch.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.pose.dat b/release/datafiles/icons/brush.sculpt.pose.dat
index 6183583ea27..f70345c9c11 100644
Binary files a/release/datafiles/icons/brush.sculpt.pose.dat and b/release/datafiles/icons/brush.sculpt.pose.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.rotate.dat b/release/datafiles/icons/brush.sculpt.rotate.dat
index 8d1723a8c71..f3ed8ee350e 100644
Binary files a/release/datafiles/icons/brush.sculpt.rotate.dat and b/release/datafiles/icons/brush.sculpt.rotate.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.scrape.dat b/release/datafiles/icons/brush.sculpt.scrape.dat
index 9b37a9876a1..c452ba20b47 100644
Binary files a/release/datafiles/icons/brush.sculpt.scrape.dat and b/release/datafiles/icons/brush.sculpt.scrape.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.simplify.dat b/release/datafiles/icons/brush.sculpt.simplify.dat
index f7de2f97aa1..eec8f6c86e6 100644
Binary files a/release/datafiles/icons/brush.sculpt.simplify.dat and b/release/datafiles/icons/brush.sculpt.simplify.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.smooth.dat b/release/datafiles/icons/brush.sculpt.smooth.dat
index 36d8098ad26..43e6e42d29a 100644
Binary files a/release/datafiles/icons/brush.sculpt.smooth.dat and b/release/datafiles/icons/brush.sculpt.smooth.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.snake_hook.dat b/release/datafiles/icons/brush.sculpt.snake_hook.dat
index 20300c1d97c..c89e5133b69 100644
Binary files a/release/datafiles/icons/brush.sculpt.snake_hook.dat and b/release/datafiles/icons/brush.sculpt.snake_hook.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.thumb.dat b/release/datafiles/icons/brush.sculpt.thumb.dat
index 9da33eccd98..e9b6777ee46 100644
Binary files a/release/datafiles/icons/brush.sculpt.thumb.dat and b/release/datafiles/icons/brush.sculpt.thumb.dat differ
diff --git a/release/datafiles/icons/ops.sculpt.border_hide.dat b/release/datafiles/icons/ops.sculpt.border_hide.dat
index 67cd306805c..45f74c63e58 100644
Binary files a/release/datafiles/icons/ops.sculpt.border_hide.dat and b/release/datafiles/icons/ops.sculpt.border_hide.dat differ
diff --git a/release/datafiles/icons/ops.sculpt.border_mask.dat b/release/datafiles/icons/ops.sculpt.border_mask.dat
index 0c616d5dc42..8805a7fead7 100644
Binary files a/release/datafiles/icons/ops.sculpt.border_mask.dat and b/release/datafiles/icons/ops.sculpt.border_mask.dat differ
diff --git a/release/datafiles/icons/ops.sculpt.box_trim.dat b/release/datafiles/icons/ops.sculpt.box_trim.dat
inde

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list