[Bf-blender-cvs] [63c472b4f9f] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 63c472b4f9f7eae787bf4ce36160a28a1777bc76
Author: Sergey Sharybin
Date:   Wed Oct 4 22:18:05 2017 +0500
Branches: blender2.8
https://developer.blender.org/rB63c472b4f9f7eae787bf4ce36160a28a1777bc76

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/mesh/meshtools.c
index 5261baeab57,c900373a59c..da0da05bb13
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@@ -79,8 -77,8 +79,8 @@@
   * return 0 if no join is made (error) and 1 if the join is done */
  
  static void join_mesh_single(
 -        Main *bmain, Scene *scene,
 +        bContext *C, Main *bmain, Scene *scene,
-         Object *ob_dst, Base *base_src, float imat[4][4],
+         Object *ob_dst, Object *ob_src, float imat[4][4],
          MVert **mvert_pp, MEdge **medge_pp, MLoop **mloop_pp, MPoly **mpoly_pp,
          CustomData *vdata, CustomData *edata, CustomData *ldata, CustomData *pdata,
          int totvert, int totedge, int totloop, int totpoly,
@@@ -88,10 -86,9 +88,10 @@@
          Material **matar, int *matmap, int totcol,
          int *vertofs, int *edgeofs, int *loopofs, int *polyofs)
  {
 +	EvaluationContext eval_ctx;
  	int a, b;
  
- 	Mesh *me = base_src->object->data;
+ 	Mesh *me = ob_src->data;
  	MVert *mvert = *mvert_pp;
  	MEdge *medge = *medge_pp;
  	MLoop *mloop = *mloop_pp;
@@@ -216,13 -211,13 +216,13 @@@
  	}
  
  	if (me->totloop) {
- 		if (base_src->object != ob_dst) {
+ 		if (ob_src != ob_dst) {
  			MultiresModifierData *mmd;
  
- 			multiresModifier_prepare_join(&eval_ctx, scene, base_src->object, ob_dst);
 -			multiresModifier_prepare_join(scene, ob_src, ob_dst);
++			multiresModifier_prepare_join(&eval_ctx, scene, ob_src, ob_dst);
  
- 			if ((mmd = get_multires_modifier(scene, base_src->object, true))) {
- 				ED_object_iter_other(bmain, base_src->object, true,
+ 			if ((mmd = get_multires_modifier(scene, ob_src, true))) {
+ 				ED_object_iter_other(bmain, ob_src, true,
  				                     ED_object_multires_update_totlevels_cb,
  				                     &mmd->totlvl);
  			}
@@@ -499,8 -493,8 +498,8 @@@ int join_mesh_exec(bContext *C, wmOpera
  	 * active mesh will remain first ones in new result of the merge, in same order for CD layers, etc. See also T50084.
  	 */
  	join_mesh_single(
 -	            bmain, scene,
 +	            C, bmain, scene,
- 	            ob, ob_base, imat,
+ 	            ob, ob, imat,
  	            &mvert, &medge, &mloop, &mpoly,
  	            &vdata, &edata, &ldata, &pdata,
  	            totvert, totedge, totloop, totpoly,
@@@ -516,8 -510,8 +515,8 @@@
  		/* only join if this is a mesh */
  		if (base->object->type == OB_MESH) {
  			join_mesh_single(
 -			            bmain, scene,
 +			            C, bmain, scene,
- 			            ob, base, imat,
+ 			            ob, base->object, imat,
  			            &mvert, &medge, &mloop, &mpoly,
  			            &vdata, &edata, &ldata, &pdata,
  			            totvert, totedge, totloop, totpoly,
diff --cc source/blender/editors/sculpt_paint/paint_vertex.c
index 1df6030bb10,a6b41b51ca6..5d87030bc67
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@@ -2981,8 -2996,10 +3017,12 @@@ static void vpaint_stroke_update_step(b
  
  	swap_m4m4(vc->rv3d->persmat, mat);
  
 +	BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
 +
+ 	if (vp->paint.brush->vertexpaint_tool == PAINT_BLEND_SMEAR) {
+ 		SWAP(uint *, vpd->smear.color_curr, vpd->smear.color_prev);
+ 	}
+ 
  	/* calculate pivot for rotation around seletion if needed */
  	/* also needed for "View Selected" on last stroke */
  	paint_last_stroke_update(scene, vc->ar, mval);