Sculpt: fix T102436: missing null pointer check in automasking code

This commit is contained in:
Joseph Eagar 2022-11-24 08:53:15 -08:00
parent 008cc625aa
commit 959f3cd645
Notes: blender-bot 2023-02-14 01:21:16 +01:00
Referenced by issue #102436, Crash using any Filter when some automasking options are activated.
2 changed files with 5 additions and 1 deletions

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

View File

@ -1356,6 +1356,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);