[Bf-blender-cvs] [d7465c23c74] master: Fix T70564: sculpt mask display missing with shape keys or deforming modifiers

[Brecht Van Lommel]

Commit: d7465c23c74931ae6c3fef9ba4f1687c66498c36
Author: Brecht Van Lommel
Date:   Mon Oct 7 17:36:09 2019 +0200
Branches: master
https://developer.blender.org/rBd7465c23c74931ae6c3fef9ba4f1687c66498c36

Fix T70564: sculpt mask display missing with shape keys or deforming modifiers

===================================================================

M	source/blender/draw/modes/sculpt_mode.c

===================================================================

diff --git a/source/blender/draw/modes/sculpt_mode.c b/source/blender/draw/modes/sculpt_mode.c
index f83a8f542c6..9749619cffe 100644
--- a/source/blender/draw/modes/sculpt_mode.c
+++ b/source/blender/draw/modes/sculpt_mode.c
@@ -155,8 +155,9 @@ static void SCULPT_cache_populate(void *vedata, Object *ob)
   if (ob->sculpt) {
     const DRWContextState *draw_ctx = DRW_context_state_get();
 
-    if ((ob == draw_ctx->obact) && (BKE_sculptsession_use_pbvh_draw(ob, draw_ctx->v3d) ||
-                                    !ob->sculpt->deform_modifiers_active)) {
+    if ((ob == draw_ctx->obact) &&
+        (BKE_sculptsession_use_pbvh_draw(ob, draw_ctx->v3d) ||
+         ob->sculpt->deform_modifiers_active || ob->sculpt->shapekey_active)) {
       PBVH *pbvh = ob->sculpt->pbvh;
       if (pbvh && pbvh_has_mask(pbvh)) {
         DRW_shgroup_call_sculpt(stl->g_data->mask_overlay_grp, ob, false, true, false);