[Bf-blender-cvs] [2157115fa60] temp-sculpt-roll-mapping: temp-sculpt-roll-mapping: Fix merge errors

[Joseph Eagar]

Commit: 2157115fa606a864055dd40b572810ba0aed473a
Author: Joseph Eagar
Date:   Fri Dec 30 14:21:26 2022 -0800
Branches: temp-sculpt-roll-mapping
https://developer.blender.org/rB2157115fa606a864055dd40b572810ba0aed473a

temp-sculpt-roll-mapping: Fix merge errors

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

M	source/blender/editors/sculpt_paint/paint_stroke.cc
M	source/blender/editors/sculpt_paint/sculpt.cc
M	source/tools

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

diff --git a/source/blender/editors/sculpt_paint/paint_stroke.cc b/source/blender/editors/sculpt_paint/paint_stroke.cc
index 832a968d9f4..fdf8343c48b 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.cc
+++ b/source/blender/editors/sculpt_paint/paint_stroke.cc
@@ -552,7 +552,7 @@ static bool paint_stroke_use_scene_spacing(Brush *brush, ePaintMode mode)
   return false;
 }
 
-static bool paint_tool_raycast_original(Brush *brush, ePaintMode UNUSED(mode))
+static bool paint_tool_raycast_original(Brush *brush, ePaintMode /*mode*/)
 {
   return brush->flag & (BRUSH_ANCHORED | BRUSH_DRAG_DOT);
 }
@@ -1329,7 +1329,7 @@ PaintStroke *paint_stroke_new(bContext *C,
   return stroke;
 }
 
-void paint_stroke_free(bContext *C, wmOperator *UNUSED(op), PaintStroke *stroke)
+void paint_stroke_free(bContext *C, wmOperator * /*op*/, PaintStroke *stroke)
 {
   RegionView3D *rv3d = CTX_wm_region_view3d(C);
   if (rv3d) {
diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc
index 3c1cf4dbf7b..1e083c8a4a6 100644
--- a/source/blender/editors/sculpt_paint/sculpt.cc
+++ b/source/blender/editors/sculpt_paint/sculpt.cc
@@ -2660,7 +2660,7 @@ float SCULPT_brush_strength_factor(SculptSession *ss,
       if (SCULPT_has_colors(ss)) {
         float color[4] = {point_3d[0], point_3d[1], 0.0f, 1.0f};
 
-#  if 1
+#  if 0
         for (int i = 0; i < 3; i++) {
           color[i] = tile_point[i] - std::floor(tile_point[i]);
         }
diff --git a/source/tools b/source/tools
index 9e33a8678a3..fdfa2fcb949 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 9e33a8678a3b97d2fdb833349657c3cc1c04811f
+Subproject commit fdfa2fcb9495d87571f2dfe2ae9fa0e032536600