diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
| commit | 8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94 (patch) | |
| tree | f5742a0f4414a99bd6738aae9cf4dc21b307fbfc /source/blender/blenkernel/intern/paint.c | |
| parent | da00a50f7f48bfd95924705e69babea41f9d7b2b (diff) | |
| parent | 7cc2b27099b7435cc1a29a48ae0e4c8335d811f3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 81943d470dc..2e44c941791 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -947,7 +947,7 @@ void BKE_sculpt_update_mesh_elements( if (!CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK)) { #if 1 BKE_sculpt_mask_layers_ensure(ob, mmd); -#else /* if we wanted to support adding mask data while multi-res painting, we would need to do this */ +#else /* if we wanted to support adding mask data while multi-res painting, we would need to do this */ if ((ED_sculpt_mask_layers_ensure(ob, mmd) & ED_SCULPT_MASK_LAYER_CALC_LOOP)) { /* remake the derived mesh */ ob->recalc |= OB_RECALC_DATA; |