1 files changed, 16 insertions, 22 deletions

diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 662485bf4f7..d42bbfdc43a 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -588,15 +588,15 @@ static Brush *image_paint_brush(bContext *C)
 
 static int image_paint_poll(bContext *C)
 {
-	EvaluationContext eval_ctx;
-	CTX_data_eval_ctx(C, &eval_ctx);
 	Object *obact;
 
 	if (!image_paint_brush(C)) {
 		return 0;
 	}
+
+	const WorkSpace *workspace = CTX_wm_workspace(C);
 	obact = CTX_data_active_object(C);
-	if ((obact && eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT) && CTX_wm_region_view3d(C)) {
+	if ((obact && workspace->object_mode & OB_MODE_TEXTURE_PAINT) && CTX_wm_region_view3d(C)) {
 		return 1;
 	}
 	else {
@@ -1472,13 +1472,12 @@ void PAINT_OT_texture_paint_toggle(wmOperatorType *ot)
 
 static int brush_colors_flip_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	EvaluationContext eval_ctx;
-	CTX_data_eval_ctx(C, &eval_ctx);
 	UnifiedPaintSettings *ups = &CTX_data_tool_settings(C)->unified_paint_settings;
 
-	Brush *br;
+	WorkSpace *workspace = CTX_wm_workspace(C);
 	Object *ob = CTX_data_active_object(C);
-	if (!(ob && (eval_ctx.object_mode & OB_MODE_VERTEX_PAINT))) {
+	Brush *br;
+	if (!(ob && (workspace->object_mode & OB_MODE_VERTEX_PAINT))) {
 		br = image_paint_brush(C);
 	}
 	else {
@@ -1510,9 +1509,8 @@ static int brush_colors_flip_poll(bContext *C)
 	else {
 		Object *ob = CTX_data_active_object(C);
 		if (ob) {
-			EvaluationContext eval_ctx;
-			CTX_data_eval_ctx(C, &eval_ctx);
-			if (eval_ctx.object_mode & OB_MODE_VERTEX_PAINT) {
+			WorkSpace *workspace = CTX_wm_workspace(C);
+			if (workspace->object_mode & OB_MODE_VERTEX_PAINT) {
 				return 1;
 			}
 		}
@@ -1555,9 +1553,8 @@ void ED_imapaint_bucket_fill(struct bContext *C, float color[3], wmOperator *op)
 static int texture_paint_poll(bContext *C)
 {
 	if (texture_paint_toggle_poll(C)) {
-		EvaluationContext eval_ctx;
-		CTX_data_eval_ctx(C, &eval_ctx);
-		if (eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT) {
+		WorkSpace *workspace = CTX_wm_workspace(C);
+		if (workspace->object_mode & OB_MODE_TEXTURE_PAINT) {
 			return 1;
 		}
 	}
@@ -1571,22 +1568,19 @@ int image_texture_paint_poll(bContext *C)
 
 int facemask_paint_poll(bContext *C)
 {
-	EvaluationContext eval_ctx;
-	CTX_data_eval_ctx(C, &eval_ctx);
-	return BKE_paint_select_face_test(&eval_ctx, CTX_data_active_object(C));
+	const WorkSpace *workspace = CTX_wm_workspace(C);
+	return BKE_paint_select_face_test(CTX_data_active_object(C), workspace->object_mode);
 }
 
 int vert_paint_poll(bContext *C)
 {
-	EvaluationContext eval_ctx;
-	CTX_data_eval_ctx(C, &eval_ctx);
-	return BKE_paint_select_vert_test(&eval_ctx, CTX_data_active_object(C));
+	const WorkSpace *workspace = CTX_wm_workspace(C);
+	return BKE_paint_select_vert_test(CTX_data_active_object(C), workspace->object_mode);
 }
 
 int mask_paint_poll(bContext *C)
 {
-	EvaluationContext eval_ctx;
-	CTX_data_eval_ctx(C, &eval_ctx);
-	return BKE_paint_select_elem_test(&eval_ctx, CTX_data_active_object(C));
+	const WorkSpace *workspace = CTX_wm_workspace(C);
+	return BKE_paint_select_elem_test(CTX_data_active_object(C), workspace->object_mode);
 }