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/paint_vertex.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/paint_vertex.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 52c096b712e..dab207d7350 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -974,7 +974,7 @@ static void vertex_paint_init_session(Depsgraph *depsgraph, Scene *scene, Object if (ob->sculpt == NULL) { ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session"); - BKE_sculpt_update_mesh_elements(depsgraph, scene, scene->toolsettings->sculpt, ob, 0, false); + BKE_sculpt_update_mesh_elements(depsgraph, scene, scene->toolsettings->sculpt, ob, false, false); } } |