diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-05-27 13:01:04 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-05-27 13:01:04 +0300 |
| commit | bab5fbb66c03145705b32453ca781bd68bdb4134 (patch) | |
| tree | e7406312045de239037b81df781cfe29b32d52f9 /source | |
| parent | ecc15c55d4e2004fc2d6347f8437d8c06c5b55b3 (diff) | |
| parent | 1c3b2b5dd8cc2d321a2f4fe1fd75059de7c91dbc (diff) | |
Merge remote-tracking branch 'origin/blender-v2.83-release'
Diffstat (limited to 'source')
| -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) || |