[Bf-blender-cvs] [9b9861578d9] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 9b9861578d9f9e61ecdb0d0753df5df1e376ecb7
Author: Campbell Barton
Date:   Fri Feb 9 13:56:49 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB9b9861578d9f9e61ecdb0d0753df5df1e376ecb7

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt.c
index d6b279008f0,d631a23bee0..5b59de06d0a
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -4602,14 -4596,10 +4602,12 @@@ static void sculpt_stroke_modifiers_che
  	SculptSession *ss = ob->sculpt;
  
  	if (ss->kb || ss->modifiers_active) {
 +		EvaluationContext eval_ctx;
- 		Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
- 		Brush *brush = BKE_paint_brush(&sd->paint);
- 
 +		CTX_data_eval_ctx(C, &eval_ctx);
- 
- 		BKE_sculpt_update_mesh_elements(&eval_ctx, CTX_data_scene(C), sd, ob,
- 		                            sculpt_any_smooth_mode(brush, ss->cache, 0), false);
+ 		Scene *scene = CTX_data_scene(C);
+ 		Sculpt *sd = scene->toolsettings->sculpt;
+ 		bool need_pmap = sculpt_any_smooth_mode(brush, ss->cache, 0);
 -		BKE_sculpt_update_mesh_elements(scene, sd, ob, need_pmap, false);
++		BKE_sculpt_update_mesh_elements(&eval_ctx, scene, sd, ob, need_pmap, false);
  	}
  }