From f9da89a38d3dc0399b7d7943c732cbaf4e336290 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 6 Feb 2018 19:17:28 +1100 Subject: Partially revert changes from 2a184f3d2b6 Ended up removing the need for eval_ctx, but left it being initialized. --- source/blender/editors/sculpt_paint/paint_vertex.c | 15 +++------------ source/blender/editors/sculpt_paint/sculpt_intern.h | 1 - 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'source/blender/editors/sculpt_paint') diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 97b1ab46b0d..c94f736bf4e 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1472,11 +1472,8 @@ static void precompute_weight_values( return; /* threaded loop over vertices */ - EvaluationContext eval_ctx; - CTX_data_eval_ctx(C, &eval_ctx); - SculptThreadedTaskData data = { - .C = C, .eval_ctx = &eval_ctx, .ob = ob, .wpd = wpd, .wpi = wpi, .me = me, + .C = C, .ob = ob, .wpd = wpd, .wpi = wpi, .me = me, }; ParallelRangeSettings settings; @@ -1848,11 +1845,8 @@ static void wpaint_paint_leaves( const Brush *brush = ob->sculpt->cache->brush; /* threaded loop over nodes */ - EvaluationContext eval_ctx; - CTX_data_eval_ctx(C, &eval_ctx); - SculptThreadedTaskData data = { - .C = C, .eval_ctx = &eval_ctx, .sd = sd, .ob = ob, .brush = brush, .nodes = nodes, + .C = C, .sd = sd, .ob = ob, .brush = brush, .nodes = nodes, .vp = vp, .wpd = wpd, .wpi = wpi, .me = me, }; @@ -2891,11 +2885,8 @@ static void vpaint_paint_leaves( { const Brush *brush = ob->sculpt->cache->brush; - EvaluationContext eval_ctx; - CTX_data_eval_ctx(C, &eval_ctx); - SculptThreadedTaskData data = { - .C = C, .eval_ctx = &eval_ctx, .sd = sd, .ob = ob, .brush = brush, .nodes = nodes, .vp = vp, .vpd = vpd, + .C = C, .sd = sd, .ob = ob, .brush = brush, .nodes = nodes, .vp = vp, .vpd = vpd, .lcol = (uint *)me->mloopcol, .me = me, }; ParallelRangeSettings settings; diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 58fad870ab3..5fb9eee805f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -130,7 +130,6 @@ struct SculptRakeData { /* Single struct used by all BLI_task threaded callbacks, let's avoid adding 10's of those... */ typedef struct SculptThreadedTaskData { struct bContext *C; - const struct EvaluationContext *eval_ctx; struct Sculpt *sd; struct Object *ob; const struct Brush *brush; -- cgit v1.2.3