[Bf-blender-cvs] [7a3e037dc0d] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 7a3e037dc0dc9e10141c5a6c5e8c149bdb530dc2
Author: Campbell Barton
Date:   Tue Jun 19 08:56:45 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7a3e037dc0dc9e10141c5a6c5e8c149bdb530dc2

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/sculpt_paint/paint_vertex.c
index ac6bfe019a1,095ba088e0c..85a1f11be4b
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@@ -967,15 -938,20 +967,20 @@@ static void do_weight_paint_vertex
  
  
  /* Toggle operator for turning vertex paint mode on or off (copied from sculpt.c) */
- static void vertex_paint_init_session(Depsgraph *depsgraph, Scene *scene, Object *ob)
 -static void vertex_paint_init_session(Scene *scene, Object *ob, eObjectMode object_mode)
++static void vertex_paint_init_session(Depsgraph *depsgraph, Scene *scene, Object *ob, eObjectMode object_mode)
  {
  	/* Create persistent sculpt mode data */
  	BKE_sculpt_toolsettings_data_ensure(scene);
  
- 	if (ob->sculpt == NULL) {
- 		ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
- 		BKE_sculpt_update_mesh_elements(depsgraph, scene, scene->toolsettings->sculpt, ob, false, false);
- 	}
+ 	BLI_assert(ob->sculpt == NULL);
+ 	ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
+ 	ob->sculpt->mode_type = object_mode;
 -	BKE_sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, false, false);
++	BKE_sculpt_update_mesh_elements(depsgraph, scene, scene->toolsettings->sculpt, ob, false, false);
+ }
+ 
 -static void vertex_paint_init_stroke(Scene *scene, Object *ob)
++static void vertex_paint_init_stroke(Depsgraph *depsgraph, Scene *scene, Object *ob)
+ {
 -	BKE_sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, false, false);
++	BKE_sculpt_update_mesh_elements(depsgraph, scene, scene->toolsettings->sculpt, ob, false, false);
  }
  
  static void vertex_paint_init_session_data(const ToolSettings *ts, Object *ob)
@@@ -1113,10 -1085,7 +1118,10 @@@ static void ed_vwpaintmode_enter_generi
  		BKE_sculptsession_free(ob);
  	}
  
- 	vertex_paint_init_session(depsgraph, scene, ob);
 -	vertex_paint_init_session(scene, ob, mode_flag);
++	vertex_paint_init_session(depsgraph, scene, ob, mode_flag);
 +
 +	/* Flush object mode. */
 +	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
  }
  
  void ED_object_vpaintmode_enter_ex(
@@@ -1556,7 -1510,7 +1561,7 @@@ static bool wpaint_stroke_test_start(bC
  	}
  
  	/* If not previously created, create vertex/weight paint mode session data */
- 	vertex_paint_init_session(depsgraph, scene, ob);
 -	vertex_paint_init_stroke(scene, ob);
++	vertex_paint_init_stroke(depsgraph, scene, ob);
  	vwpaint_update_cache_invariants(C, vp, ss, op, mouse);
  	vertex_paint_init_session_data(ts, ob);
  
@@@ -2545,7 -2487,7 +2550,7 @@@ static bool vpaint_stroke_test_start(bC
  	}
  
  	/* If not previously created, create vertex/weight paint mode session data */
- 	vertex_paint_init_session(depsgraph, scene, ob);
 -	vertex_paint_init_stroke(scene, ob);
++	vertex_paint_init_stroke(depsgraph, scene, ob);
  	vwpaint_update_cache_invariants(C, vp, ss, op, mouse);
  	vertex_paint_init_session_data(ts, ob);
  
diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 8faf7f2c14a,280e22084cc..414b9f2062f
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -4808,9 -4804,8 +4808,9 @@@ static void sculpt_brush_init_tex(cons
  	sculpt_update_tex(scene, sd, ss);
  }
  
- static bool sculpt_brush_stroke_init(bContext *C, wmOperator *op)
+ static void sculpt_brush_stroke_init(bContext *C, wmOperator *op)
  {
 +	Depsgraph *depsgraph = CTX_data_depsgraph(C);
  	Scene *scene = CTX_data_scene(C);
  	Object *ob = CTX_data_active_object(C);
  	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
@@@ -4828,9 -4823,7 +4828,7 @@@
  	sculpt_brush_init_tex(scene, sd, ss);
  
  	is_smooth = sculpt_any_smooth_mode(brush, NULL, mode);
 -	BKE_sculpt_update_mesh_elements(scene, sd, ob, is_smooth, need_mask);
 +	BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, is_smooth, need_mask);
- 
- 	return 1;
  }
  
  static void sculpt_restore_mesh(Sculpt *sd, Object *ob)