[Bf-blender-cvs] [7640d5e92aa] master: Error in last commit, weight must be set for non-accumulate

[Campbell Barton]

Commit: 7640d5e92aac588101719574c7d0ee36baac6416
Author: Campbell Barton
Date:   Tue Oct 3 19:24:02 2017 +1100
Branches: master
https://developer.blender.org/rB7640d5e92aac588101719574c7d0ee36baac6416

Error in last commit, weight must be set for non-accumulate

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

M	source/blender/editors/sculpt_paint/paint_vertex.c

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

diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index ee8934422bc..547cd9566e4 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1806,6 +1806,7 @@ static void wpaint_paint_leaves(
         bContext *C, Object *ob, Sculpt *sd, VPaint *vp, struct WPaintData *wpd, WeightPaintInfo *wpi,
         Mesh *me, PBVHNode **nodes, int totnode)
 {
+	Scene *scene = CTX_data_scene(C);
 	const Brush *brush = ob->sculpt->cache->brush;
 
 	/* threaded loop over nodes */
@@ -1813,6 +1814,9 @@ static void wpaint_paint_leaves(
 		.sd = sd, .ob = ob, .brush = brush, .nodes = nodes, .vp = vp, .wpd = wpd, .wpi = wpi, .me = me, .C = C,
 	};
 
+	/* Use this so average can modify its weight without touching the brush. */
+	data.strength = BKE_brush_weight_get(scene, brush);
+
 	/* current mirroring code cannot be run in parallel */
 	bool use_threading = !(me->editflag & ME_EDIT_MIRROR_X);