1 files changed, 14 insertions, 10 deletions

diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 8f2f6595408..95ed8967380 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -44,6 +44,8 @@
 
 #include "IMB_imbuf_types.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_image.h"  /* own include */
 #include "ED_mesh.h"
 #include "ED_screen.h"
@@ -321,15 +323,16 @@ bool ED_image_slot_cycle(struct Image *image, int direction)
 
 void ED_space_image_scopes_update(const struct bContext *C, struct SpaceImage *sima, struct ImBuf *ibuf, bool use_view_settings)
 {
+	const WorkSpace *workspace = CTX_wm_workspace(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
-	
+
 	/* scope update can be expensive, don't update during paint modes */
 	if (sima->mode == SI_MODE_PAINT)
 		return;
-	if (ob && ((ob->mode & (OB_MODE_TEXTURE_PAINT | OB_MODE_EDIT)) != 0))
+	if (ob && ((workspace->object_mode & (OB_MODE_TEXTURE_PAINT | OB_MODE_EDIT)) != 0)) {
 		return;
-
+	}
 	/* We also don't update scopes of render result during render. */
 	if (G.is_rendering) {
 		const Image *image = sima->image;
@@ -365,7 +368,7 @@ bool ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
 		struct BMEditMesh *em = BKE_editmesh_from_object(obedit);
 		bool ret;
 
-		ret = EDBM_mtexpoly_check(em);
+		ret = EDBM_uv_check(em);
 
 		return ret;
 	}
@@ -374,11 +377,12 @@ bool ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
 }
 
 /* matches clip function */
-bool ED_space_image_check_show_maskedit(Scene *scene, SpaceImage *sima)
+bool ED_space_image_check_show_maskedit(
+        SpaceImage *sima, const WorkSpace *workspace, ViewLayer *view_layer)
 {
 	/* check editmode - this is reserved for UV editing */
-	Object *ob = OBACT;
-	if (ob && ob->mode & OB_MODE_EDIT && ED_space_image_show_uvedit(sima, ob)) {
+	Object *ob = OBACT(view_layer);
+	if (ob && (workspace->object_mode & OB_MODE_EDIT) && ED_space_image_show_uvedit(sima, ob)) {
 		return false;
 	}
 
@@ -388,10 +392,10 @@ bool ED_space_image_check_show_maskedit(Scene *scene, SpaceImage *sima)
 int ED_space_image_maskedit_poll(bContext *C)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
-
 	if (sima) {
-		Scene *scene = CTX_data_scene(C);
-		return ED_space_image_check_show_maskedit(scene, sima);
+		WorkSpace *workspace = CTX_wm_workspace(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		return ED_space_image_check_show_maskedit(sima, workspace, view_layer);
 	}
 
 	return false;