Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Feb 2018 02:56:49 +0000 (13:56 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Feb 2018 02:56:49 +0000 (13:56 +1100)
1  2 
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_sequencer/sequencer_edit.c

@@@ -4602,14 -4596,10 +4602,12 @@@ static void sculpt_stroke_modifiers_che
        SculptSession *ss = ob->sculpt;
  
        if (ss->kb || ss->modifiers_active) {
-               Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-               Brush *brush = BKE_paint_brush(&sd->paint);
 +              EvaluationContext eval_ctx;
-               BKE_sculpt_update_mesh_elements(&eval_ctx, CTX_data_scene(C), sd, ob,
-                                           sculpt_any_smooth_mode(brush, ss->cache, 0), false);
 +              CTX_data_eval_ctx(C, &eval_ctx);
 -              BKE_sculpt_update_mesh_elements(scene, sd, ob, need_pmap, 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(&eval_ctx, scene, sd, ob, need_pmap, false);
        }
  }