1 files changed, 16 insertions, 11 deletions

diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index 264135d1d03..ff261a808da 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -35,8 +35,6 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BIF_glutil.h"
-
 #include "BLI_bitmap_draw_2d.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_geom.h"
@@ -52,6 +50,8 @@
 #include "BKE_paint.h"
 #include "BKE_subsurf.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -134,6 +134,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op)
 	ARegion *ar = CTX_wm_region(C);
 	struct Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
+	EvaluationContext eval_ctx;
 	PaintMaskFloodMode mode;
 	float value;
 	PBVH *pbvh;
@@ -142,10 +143,12 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op)
 	bool multires;
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 
+	CTX_data_eval_ctx(C, &eval_ctx);
+
 	mode = RNA_enum_get(op->ptr, "mode");
 	value = RNA_float_get(op->ptr, "value");
 
-	BKE_sculpt_update_mesh_elements(scene, sd, ob, false, true);
+	BKE_sculpt_update_mesh_elements(&eval_ctx, scene, sd, ob, false, true);
 	pbvh = ob->sculpt->pbvh;
 	multires = (BKE_pbvh_type(pbvh) == PBVH_GRIDS);
 
@@ -258,9 +261,9 @@ static void mask_box_select_task_cb(
 
 int ED_sculpt_mask_box_select(struct bContext *C, ViewContext *vc, const rcti *rect, bool select, bool UNUSED(extend))
 {
+	EvaluationContext eval_ctx;
 	Sculpt *sd = vc->scene->toolsettings->sculpt;
 	BoundBox bb;
-	bglMats mats = {{0}};
 	float clip_planes[4][4];
 	float clip_planes_final[4][4];
 	ARegion *ar = vc->ar;
@@ -274,15 +277,16 @@ int ED_sculpt_mask_box_select(struct bContext *C, ViewContext *vc, const rcti *r
 	int totnode, symmpass;
 	int symm = sd->paint.symmetry_flags & PAINT_SYMM_AXIS_ALL;
 
+	CTX_data_eval_ctx(C, &eval_ctx);
+
 	mode = PAINT_MASK_FLOOD_VALUE;
 	value = select ? 1.0 : 0.0;
 
 	/* transform the clip planes in object space */
-	view3d_get_transformation(vc->ar, vc->rv3d, vc->obact, &mats);
-	ED_view3d_clipping_calc(&bb, clip_planes, &mats, rect);
+	ED_view3d_clipping_calc(&bb, clip_planes, vc->ar, vc->obact, rect);
 	negate_m4(clip_planes);
 
-	BKE_sculpt_update_mesh_elements(scene, sd, ob, false, true);
+	BKE_sculpt_update_mesh_elements(&eval_ctx, scene, sd, ob, false, true);
 	pbvh = ob->sculpt->pbvh;
 	multires = (BKE_pbvh_type(pbvh) == PBVH_GRIDS);
 
@@ -424,9 +428,9 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
 	const int (*mcords)[2] = WM_gesture_lasso_path_to_array(C, op, &mcords_tot);
 
 	if (mcords) {
+		EvaluationContext eval_ctx;
 		float clip_planes[4][4], clip_planes_final[4][4];
 		BoundBox bb;
-		bglMats mats = {{0}};
 		Object *ob;
 		ViewContext vc;
 		LassoMaskData data;
@@ -440,11 +444,12 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
 		PaintMaskFloodMode mode = RNA_enum_get(op->ptr, "mode");
 		float value = RNA_float_get(op->ptr, "value");
 
+		CTX_data_eval_ctx(C, &eval_ctx);
+
 		/* Calculations of individual vertices are done in 2D screen space to diminish the amount of
 		 * calculations done. Bounding box PBVH collision is not computed against enclosing rectangle
 		 * of lasso */
 		view3d_set_viewcontext(C, &vc);
-		view3d_get_transformation(vc.ar, vc.rv3d, vc.obact, &mats);
 
 		/* lasso data calculations */
 		data.vc = &vc;
@@ -460,10 +465,10 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
 		       mcords, mcords_tot,
 		       mask_lasso_px_cb, &data);
 
-		ED_view3d_clipping_calc(&bb, clip_planes, &mats, &data.rect);
+		ED_view3d_clipping_calc(&bb, clip_planes, vc.ar, vc.obact, &data.rect);
 		negate_m4(clip_planes);
 
-		BKE_sculpt_update_mesh_elements(scene, sd, ob, false, true);
+		BKE_sculpt_update_mesh_elements(&eval_ctx, scene, sd, ob, false, true);
 		pbvh = ob->sculpt->pbvh;
 		multires = (BKE_pbvh_type(pbvh) == PBVH_GRIDS);