mask transform now works in the image space

1 files changed, 18 insertions, 6 deletions

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 8651241f338..c7846b3935b 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -607,6 +607,15 @@ static void recalcData_nla(TransInfo *t)
 	}
 }
 
+static void recalcData_mask_common(TransInfo *t)
+{
+	Mask *mask = CTX_data_edit_mask(t->context);
+
+	flushTransMasking(t);
+
+	DAG_id_tag_update(&mask->id, 0);
+}
+
 /* helper for recalcData() - for Image Editor transforms */
 static void recalcData_image(TransInfo *t)
 {
@@ -619,6 +628,9 @@ static void recalcData_image(TransInfo *t)
 		
 		DAG_id_tag_update(t->obedit->data, 0);
 	}
+	else if (t->options & CTX_MASK) {
+		recalcData_mask_common(t);
+	}
 }
 
 /* helper for recalcData() - for Movie Clip transforms */
@@ -662,12 +674,8 @@ static void recalcData_spaceclip(TransInfo *t)
 
 		DAG_id_tag_update(&clip->id, 0);
 	}
-	else if (ED_space_clip_check_show_maskedit(sc)) {
-		Mask *mask = ED_space_clip_get_mask(sc);
-
-		flushTransMasking(t);
-
-		DAG_id_tag_update(&mask->id, 0);
+	else if (t->options & CTX_MASK) {
+		recalcData_mask_common(t);
 	}
 }
 
@@ -908,6 +916,10 @@ void recalcData(TransInfo *t)
 	else if (t->spacetype == SPACE_CLIP) {
 		recalcData_spaceclip(t);
 	}
+
+	if (t->options & CTX_MASK) {
+
+	}
 }
 
 void drawLine(TransInfo *t, float *center, float *dir, char axis, short options)