diff options
| author | Luca Rood <dev@lucarood.com> | 2017-02-27 22:08:25 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-02-27 22:08:25 +0300 |
| commit | 6ab9af0083a947b88ef71b247ce1853145351890 (patch) | |
| tree | a71df9e88cfd2b75ffa0db795cc8bf0dc5377767 /source/blender/editors/sculpt_paint | |
| parent | bf243752fc3ff2eebc842c250aaa7f7be5aadb73 (diff) | |
| parent | 4fa4132e45c97df24108b14fa3c11b2b4b04d22c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index bd73186cfbb..d1965d93172 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -5364,8 +5364,12 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op) if (mmd) multires_force_update(ob); - if (flush_recalc || (ob->sculpt && ob->sculpt->bm)) + /* Always for now, so leaving sculpt mode always ensures scene is in + * a consistent state. + */ + if (true || flush_recalc || (ob->sculpt && ob->sculpt->bm)) { DAG_id_tag_update(&ob->id, OB_RECALC_DATA); + } if (me->flag & ME_SCULPT_DYNAMIC_TOPOLOGY) { /* Dynamic topology must be disabled before exiting sculpt |