griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Sean Kim
2025-02-18 13:22:19 -08:00
parent b164f5a86c c07f37287c
commit a613d971b9
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/sculpt_paint/paint_vertex.cc
View File

@@ -1081,6 +1081,7 @@ static void do_vpaint_brush_blur_loops(const bContext *C,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}
@@ -1236,6 +1237,7 @@ static void do_vpaint_brush_blur_verts(const bContext *C,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}
@@ -1394,6 +1396,7 @@ static void do_vpaint_brush_smear(const bContext *C,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}
@@ -1576,6 +1579,7 @@ static void calculate_average_color(VPaintData &vpd,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}
@@ -1705,6 +1709,7 @@ static void vpaint_do_draw(const bContext *C,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}

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

@@ -1137,6 +1137,7 @@ static void do_wpaint_brush_blur(const Depsgraph &depsgraph,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}
@@ -1255,6 +1256,7 @@ static void do_wpaint_brush_smear(const Depsgraph &depsgraph,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}
@@ -1372,6 +1374,7 @@ static void do_wpaint_brush_draw(const Depsgraph &depsgraph,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}
@@ -1459,6 +1462,7 @@ static float calculate_average_weight(const Depsgraph &depsgraph,
tls.factors.resize(verts.size());
const MutableSpan<float> factors = tls.factors;
fill_factor_from_hide(hide_vert, verts, factors);
filter_region_clip_factors(ss, vert_positions, verts, factors);
if (!select_vert.is_empty()) {
filter_factors_with_selection(select_vert, verts, factors);
}