blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

temp-sculpt-roll-mapping: Fix merge errors

This commit is contained in:
Joseph Eagar 2022-12-30 14:21:26 -08:00
parent 8931df291a
commit 2157115fa6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/sculpt_paint/paint_stroke.cc
View File

@ -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) {

2
source/blender/editors/sculpt_paint/sculpt.cc
View File

@ -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]);
}

2
source/tools

@ -1 +1 @@
Subproject commit 9e33a8678a3b97d2fdb833349657c3cc1c04811f
Subproject commit fdfa2fcb9495d87571f2dfe2ae9fa0e032536600