diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-05-27 12:58:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-05-27 13:00:00 +0300 |
| commit | 1c3b2b5dd8cc2d321a2f4fe1fd75059de7c91dbc (patch) | |
| tree | 29fa928f533de1a8435ac8f58e251f9c8eabbec1 /source/blender/draw/engines/overlay/overlay_engine.c | |
| parent | f772a4b8fa87d537de6b579d5b4a72d1874818c3 (diff) | |
Fix T77105: Crashes when clicking "new scene" button
This was introduced on ecc395e473d.
Effectively this is reverting that commit for cases when
scene->toolsettings->sculpt is NULL. But since the facesets are only
working for sculpting this should be fine.
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_engine.c')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_engine.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c index 0e1bbaf284d..61337ac8d1d 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.c +++ b/source/blender/draw/engines/overlay/overlay_engine.c @@ -78,11 +78,14 @@ static void OVERLAY_engine_init(void *vedata) if (v3d->shading.type == OB_WIRE) { pd->overlay.flag |= V3D_OVERLAY_WIREFRAMES; } - if (ts->sculpt->flags & SCULPT_HIDE_FACE_SETS) { - pd->overlay.sculpt_mode_face_sets_opacity = 0.0f; - } - if (ts->sculpt->flags & SCULPT_HIDE_MASK) { - pd->overlay.sculpt_mode_mask_opacity = 0.0f; + + if (ts->sculpt) { + if (ts->sculpt->flags & SCULPT_HIDE_FACE_SETS) { + pd->overlay.sculpt_mode_face_sets_opacity = 0.0f; + } + if (ts->sculpt->flags & SCULPT_HIDE_MASK) { + pd->overlay.sculpt_mode_mask_opacity = 0.0f; + } } pd->use_in_front = (v3d->shading.type <= OB_SOLID) || |