move mask and draw settings into its own struct to be shared between spaces.

3 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 37da40e11b3..7734661aa96 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -198,8 +198,8 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 	clip_draw_curfra_label(sc, x, 8.0f);
 
 	/* movie clip animation */
-	if ((sc->mode == SC_MODE_MASKEDIT) && sc->mask) {
-		MaskLayer *masklay = BKE_mask_layer_active(sc->mask);
+	if ((sc->mode == SC_MODE_MASKEDIT) && sc->mask_info.mask) {
+		MaskLayer *masklay = BKE_mask_layer_active(sc->mask_info.mask);
 		if (masklay) {
 			MaskLayerShape *masklay_shape;
 
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 224a250fe4c..9bde3a3d4d5 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -115,7 +115,7 @@ int ED_space_clip_maskedit_mask_poll(bContext *C)
 		if (clip) {
 			SpaceClip *sc = CTX_wm_space_clip(C);
 
-			return sc->mask != NULL;
+			return sc->mask_info.mask != NULL;
 		}
 	}
 
@@ -509,14 +509,14 @@ void ED_space_clip_set_clip(bContext *C, bScreen *screen, SpaceClip *sc, MovieCl
 
 Mask *ED_space_clip_get_mask(SpaceClip *sc)
 {
-	return sc->mask;
+	return sc->mask_info.mask;
 }
 
 void ED_space_clip_set_mask(bContext *C, SpaceClip *sc, Mask *mask)
 {
-	sc->mask = mask;
+	sc->mask_info.mask = mask;
 
-	if (sc->mask && sc->mask->id.us == 0) {
+	if (sc->mask_info.mask && sc->mask_info.mask->id.us == 0) {
 		sc->clip->id.us = 1;
 	}
 
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index bdbfa250674..9b1ffcf31b1 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -766,8 +766,8 @@ static int clip_context(const bContext *C, const char *member, bContextDataResul
 		return TRUE;
 	}
 	else if (CTX_data_equals(member, "edit_mask")) {
-		if (sc->mask)
-			CTX_data_id_pointer_set(result, &sc->mask->id);
+		if (sc->mask_info.mask)
+			CTX_data_id_pointer_set(result, &sc->mask_info.mask->id);
 		return TRUE;
 	}
 
@@ -1120,7 +1120,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
 			int width, height;
 			ED_mask_size(C, &width, &height);
 			ED_mask_draw_region(mask, ar,
-			                    sc->mask_draw_flag, sc->mask_draw_type,
+			                    sc->mask_info.draw_flag, sc->mask_info.draw_type,
 			                    width, height,
 			                    TRUE, TRUE,
 			                    sc->stabmat, C);