Object Mode: use eval_ctx for context/screen code

1 files changed, 25 insertions, 14 deletions

diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c
index 9e28a5f84ec..b58cb9cfabe 100644
--- a/source/blender/editors/util/undo.c
+++ b/source/blender/editors/util/undo.c
@@ -49,6 +49,8 @@
 #include "BKE_main.h"
 #include "BKE_screen.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_armature.h"
 #include "ED_particle.h"
 #include "ED_curve.h"
@@ -77,6 +79,8 @@
 
 void ED_undo_push(bContext *C, const char *str)
 {
+	EvaluationContext eval_ctx;
+	CTX_data_eval_ctx(C, &eval_ctx);
 	Object *obedit = CTX_data_edit_object(C);
 	Object *obact = CTX_data_active_object(C);
 
@@ -102,12 +106,12 @@ void ED_undo_push(bContext *C, const char *str)
 		else if (obedit->type == OB_ARMATURE)
 			undo_push_armature(C, str);
 	}
-	else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) {
+	else if (obact && eval_ctx.object_mode & OB_MODE_PARTICLE_EDIT) {
 		if (U.undosteps == 0) return;
 
 		PE_undo_push(CTX_data_scene(C), CTX_data_view_layer(C), str);
 	}
-	else if (obact && obact->mode & OB_MODE_SCULPT) {
+	else if (obact && eval_ctx.object_mode & OB_MODE_SCULPT) {
 		/* do nothing for now */
 	}
 	else {
@@ -120,6 +124,8 @@ void ED_undo_push(bContext *C, const char *str)
 /* note: also check undo_history_exec() in bottom if you change notifiers */
 static int ed_undo_step(bContext *C, int step, const char *undoname)
 {
+	EvaluationContext eval_ctx;
+	CTX_data_eval_ctx(C, &eval_ctx);
 	wmWindowManager *wm = CTX_wm_manager(C);
 	wmWindow *win = CTX_wm_window(C);
 	Main *bmain = CTX_data_main(C);
@@ -143,7 +149,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
 	if (sa && (sa->spacetype == SPACE_IMAGE)) {
 		SpaceImage *sima = (SpaceImage *)sa->spacedata.first;
 		
-		if ((obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) || (sima->mode == SI_MODE_PAINT)) {
+		if ((obact && (eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT)) || (sima->mode == SI_MODE_PAINT)) {
 			if (!ED_undo_paint_step(C, UNDO_PAINT_IMAGE, step, undoname) && undoname) {
 				if (U.uiflag & USER_GLOBALUNDO) {
 					ED_viewport_render_kill_jobs(wm, bmain, true);
@@ -177,13 +183,13 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
 		 * That was inconsistent with editmode, and also makes for
 		 * unecessarily tricky interaction with the other undo
 		 * systems. */
-		if (obact && obact->mode & OB_MODE_TEXTURE_PAINT) {
+		if (obact && eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT) {
 			ED_undo_paint_step(C, UNDO_PAINT_IMAGE, step, undoname);
 		}
-		else if (obact && obact->mode & OB_MODE_SCULPT) {
+		else if (obact && eval_ctx.object_mode & OB_MODE_SCULPT) {
 			ED_undo_paint_step(C, UNDO_PAINT_MESH, step, undoname);
 		}
-		else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) {
+		else if (obact && eval_ctx.object_mode & OB_MODE_PARTICLE_EDIT) {
 			if (step == 1)
 				PE_undo(scene, view_layer);
 			else
@@ -269,6 +275,9 @@ void ED_undo_pop_op(bContext *C, wmOperator *op)
 /* name optionally, function used to check for operator redo panel */
 bool ED_undo_is_valid(const bContext *C, const char *undoname)
 {
+	EvaluationContext eval_ctx;
+	CTX_data_eval_ctx(C, &eval_ctx);
+
 	Object *obedit = CTX_data_edit_object(C);
 	Object *obact = CTX_data_active_object(C);
 	ScrArea *sa = CTX_wm_area(C);
@@ -276,7 +285,7 @@ bool ED_undo_is_valid(const bContext *C, const char *undoname)
 	if (sa && sa->spacetype == SPACE_IMAGE) {
 		SpaceImage *sima = (SpaceImage *)sa->spacedata.first;
 		
-		if ((obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) || (sima->mode == SI_MODE_PAINT)) {
+		if ((obact && (eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT)) || (sima->mode == SI_MODE_PAINT)) {
 			return 1;
 		}
 	}
@@ -293,15 +302,15 @@ bool ED_undo_is_valid(const bContext *C, const char *undoname)
 		
 		/* if below tests fail, global undo gets executed */
 		
-		if (obact && obact->mode & OB_MODE_TEXTURE_PAINT) {
+		if (obact && eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT) {
 			if (ED_undo_paint_is_valid(UNDO_PAINT_IMAGE, undoname))
 				return 1;
 		}
-		else if (obact && obact->mode & OB_MODE_SCULPT) {
+		else if (obact && eval_ctx.object_mode & OB_MODE_SCULPT) {
 			if (ED_undo_paint_is_valid(UNDO_PAINT_MESH, undoname))
 				return 1;
 		}
-		else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) {
+		else if (obact && eval_ctx.object_mode & OB_MODE_PARTICLE_EDIT) {
 			return PE_undo_is_valid(CTX_data_scene(C), CTX_data_view_layer(C));
 		}
 		
@@ -497,6 +506,8 @@ enum {
 
 static int get_undo_system(bContext *C)
 {
+	EvaluationContext eval_ctx;
+	CTX_data_eval_ctx(C, &eval_ctx);
 	Object *obact = CTX_data_active_object(C);
 	Object *obedit = CTX_data_edit_object(C);
 	ScrArea *sa = CTX_wm_area(C);
@@ -505,7 +516,7 @@ static int get_undo_system(bContext *C)
 	if (sa && (sa->spacetype == SPACE_IMAGE)) {
 		SpaceImage *sima = (SpaceImage *)sa->spacedata.first;
 
-		if ((obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) || (sima->mode == SI_MODE_PAINT)) {
+		if ((obact && (eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT)) || (sima->mode == SI_MODE_PAINT)) {
 			if (!ED_undo_paint_empty(UNDO_PAINT_IMAGE))
 				return UNDOSYSTEM_IMAPAINT;
 		}
@@ -518,13 +529,13 @@ static int get_undo_system(bContext *C)
 	}
 	else {
 		if (obact) {
-			if (obact->mode & OB_MODE_PARTICLE_EDIT)
+			if (eval_ctx.object_mode & OB_MODE_PARTICLE_EDIT)
 				return UNDOSYSTEM_PARTICLE;
-			else if (obact->mode & OB_MODE_TEXTURE_PAINT) {
+			else if (eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT) {
 				if (!ED_undo_paint_empty(UNDO_PAINT_IMAGE))
 					return UNDOSYSTEM_IMAPAINT;
 			}
-			else if (obact->mode & OB_MODE_SCULPT) {
+			else if (eval_ctx.object_mode & OB_MODE_SCULPT) {
 				if (!ED_undo_paint_empty(UNDO_PAINT_MESH))
 					return UNDOSYSTEM_SCULPT;
 			}