diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 19:45:45 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 19:45:45 +0300 |
| commit | 3b556a477d0741eb26d10a2e91979353346011f7 (patch) | |
| tree | 51de1de36a164433f04e4a2a174d74c156d50b70 /source/blender/editors/sculpt_paint/sculpt_undo.c | |
| parent | 5593baea1bb51d7423b9413606efbdc6004093fd (diff) | |
| parent | 80dcb2ced8a06caf6c47cb9c767214db33140fcb (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt_undo.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_undo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index bc51606f3e5..01b879a4c34 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -158,7 +158,7 @@ static bool sculpt_undo_restore_coords(bContext *C, DerivedMesh *dm, SculptUndoN if (kb) { ob->shapenr = BLI_findindex(&key->block, kb) + 1; - BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, 0, false); + BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, false, false); WM_event_add_notifier(C, NC_OBJECT | ND_DATA, ob); } else { @@ -495,7 +495,7 @@ static void sculpt_undo_restore_list(bContext *C, ListBase *lb) DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE); - BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, 0, need_mask); + BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, false, need_mask); /* call _after_ sculpt_update_mesh_elements() which may update 'ob->derivedFinal' */ dm = mesh_get_derived_final(depsgraph, scene, ob, 0); |