changes to mask editing

- use Alt to modify all mask feather at once while dragging.
- copying a multi-user mask from the interface works now.
- show masks when UV editing isnt used, rather then checking editmode (would give some odd/annoying image space header).
- add a fake mask user by default.
- moving points with LMB drag no longer selects them.

1 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 899685d0dc2..c0b6dc656c2 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -95,6 +95,10 @@ void ED_space_image_set_mask(bContext *C, SpaceImage *sima, Mask *mask)
 {
 	sima->mask_info.mask = mask;
 
+	/* weak, but same as image/space */
+	if (sima->mask_info.mask && sima->mask_info.mask->id.us == 0)
+		sima->mask_info.mask->id.us = 1;
+
 	if (C) {
 		WM_event_add_notifier(C, NC_MASK | NA_SELECTED, mask);
 	}
@@ -356,7 +360,7 @@ 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) {
+	if (ob && ob->mode & OB_MODE_EDIT && ED_space_image_show_uvedit(sima, ob)) {
 		return FALSE;
 	}