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

Merge branch 'blender-v3.4-release'

Browse Source
This commit is contained in:
Joseph Eagar
2022-11-24 09:02:23 -08:00
parent de27925aea 959f3cd645
commit 14a0fb0cc6
6 changed files with 91 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -847,7 +847,10 @@ AutomaskingCache *SCULPT_automasking_cache_init(Sculpt *sd, Brush *brush, Object
use_stroke_id = true;
if (SCULPT_is_automasking_mode_enabled(sd, brush, BRUSH_AUTOMASKING_CAVITY_USE_CURVE)) {
BKE_curvemapping_init(brush->automasking_cavity_curve);
if (brush) {
BKE_curvemapping_init(brush->automasking_cavity_curve);
}
BKE_curvemapping_init(sd->automasking_cavity_curve);
}

1
source/blender/editors/sculpt_paint/sculpt_intern.h
View File

@@ -1357,6 +1357,7 @@ float SCULPT_automasking_factor_get(struct AutomaskingCache *automasking,
* brushes and filter. */
struct AutomaskingCache *SCULPT_automasking_active_cache_get(SculptSession *ss);
/* Brush can be null. */
struct AutomaskingCache *SCULPT_automasking_cache_init(Sculpt *sd, Brush *brush, Object *ob);
void SCULPT_automasking_cache_free(struct AutomaskingCache *automasking);