resolve glitch in the image space where mask editing and UVs would conflict.

now UV editing overrides mask.

3 files changed, 12 insertions, 4 deletions

diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index ae30b646db0..d291c500547 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -71,7 +71,7 @@ int ED_space_image_show_paint(struct SpaceImage *sima);
 int ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit);
 int ED_space_image_show_uvshadow(struct SpaceImage *sima, struct Object *obedit);
 
-int ED_space_image_check_show_maskedit(struct SpaceImage *sima);
+int ED_space_image_check_show_maskedit(struct Scene *scene, struct SpaceImage *sima);
 int ED_space_image_maskedit_poll(struct bContext *C);
 int ED_space_image_maskedit_mask_poll(struct bContext *C);
 
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index a431ea7ea03..36353c43cbd 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -476,7 +476,8 @@ int ED_operator_mask(bContext *C)
 			case SPACE_IMAGE:
 			{
 				SpaceImage *sima = sa->spacedata.first;
-				return ED_space_image_check_show_maskedit(sima);
+				Scene *scene = CTX_data_scene(C);
+				return ED_space_image_check_show_maskedit(scene, sima);
 			}
 		}
 	}
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 81423560fb5..899685d0dc2 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -352,8 +352,14 @@ int ED_space_image_show_uvshadow(SpaceImage *sima, Object *obedit)
 }
 
 /* matches clip function */
-int ED_space_image_check_show_maskedit(SpaceImage *sima)
+int ED_space_image_check_show_maskedit(Scene *scene, SpaceImage *sima)
 {
+	/* check editmode - this is reserved for UV editing */
+	Object *ob = OBACT;
+	if (ob && ob->mode & OB_MODE_EDIT) {
+		return FALSE;
+	}
+
 	return (sima->mode == SI_MODE_MASK);
 }
 
@@ -362,7 +368,8 @@ int ED_space_image_maskedit_poll(bContext *C)
 	SpaceImage *sima = CTX_wm_space_image(C);
 
 	if (sima && sima->image) {
-		return ED_space_image_check_show_maskedit(sima);
+		Scene *scene = CTX_data_scene(C);
+		return ED_space_image_check_show_maskedit(scene, sima);
 	}
 
 	return FALSE;