X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/blobdiff_plain/14a68d3a5f325373e575c28405064c4782a8ff97..4f044f4ec1b682fb5b13f5aa62201314d855477b:/source/blender/editors/transform/transform_conversions.c?ds=inline

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index fbc59f4c2cb..a9716483db7 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -5046,7 +5046,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 	else if (t->spacetype == SPACE_CLIP) {
 		if (t->options & CTX_MOVIECLIP) {
 			SpaceClip *sc = t->sa->spacedata.first;
-			MovieClip *clip = ED_space_clip(sc);
+			MovieClip *clip = ED_space_clip_get_clip(sc);
 
 			if (t->scene->nodetree) {
 				/* tracks can be used for stabilization nodes,
@@ -5057,7 +5057,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		}
 		else if (t->options & CTX_MASK) {
 			SpaceClip *sc = t->sa->spacedata.first;
-			Mask *mask = ED_space_clip_mask(sc);
+			Mask *mask = ED_space_clip_get_mask(sc);
 
 			if (t->scene->nodetree) {
 				/* tracks can be used for stabilization nodes,
@@ -5653,7 +5653,7 @@ static void markerToTransDataInit(TransData *td, TransData2D *td2d, TransDataTra
 static void trackToTransData(SpaceClip *sc, TransData *td, TransData2D *td2d,
                              TransDataTracking *tdt, MovieTrackingTrack *track, float aspx, float aspy)
 {
-	int framenr = ED_space_clip_clip_framenr(sc);
+	int framenr = ED_space_clip_get_clip_frame_number(sc);
 	MovieTrackingMarker *marker = BKE_tracking_marker_ensure(track, framenr);
 
 	tdt->flag = marker->flag;
@@ -5702,12 +5702,12 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
 	TransData *td;
 	TransData2D *td2d;
 	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
+	MovieClip *clip = ED_space_clip_get_clip(sc);
 	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
 	MovieTrackingMarker *marker;
 	TransDataTracking *tdt;
-	int framenr = ED_space_clip_clip_framenr(sc);
+	int framenr = ED_space_clip_get_clip_frame_number(sc);
 	float aspx, aspy;
 
 	/* count */
@@ -5736,7 +5736,7 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
 	if (t->total == 0)
 		return;
 
-	ED_space_clip_aspect_dimension_aware(sc, &aspx, &aspy);
+	ED_space_clip_get_clip_aspect_dimension_aware(sc, &aspx, &aspy);
 
 	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransTracking TransData");
 	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransTracking TransData2D");
@@ -5830,7 +5830,7 @@ static void createTransTrackingCurvesData(bContext *C, TransInfo *t)
 	TransData *td;
 	TransData2D *td2d;
 	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
+	MovieClip *clip = ED_space_clip_get_clip(sc);
 	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
 	MovieTrackingMarker *marker, *prev_marker;
@@ -5908,7 +5908,7 @@ static void createTransTrackingData(bContext *C, TransInfo *t)
 {
 	ARegion *ar = CTX_wm_region(C);
 	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
+	MovieClip *clip = ED_space_clip_get_clip(sc);
 	int width, height;
 
 	t->total = 0;
@@ -5931,11 +5931,11 @@ static void cancelTransTracking(TransInfo *t)
 {
 	TransDataTracking *tdt = t->customData;
 	SpaceClip *sc = t->sa->spacedata.first;
-	MovieClip *clip = ED_space_clip(sc);
+	MovieClip *clip = ED_space_clip_get_clip(sc);
 	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
 	MovieTrackingMarker *marker;
-	int a, framenr = ED_space_clip_clip_framenr(sc);
+	int a, framenr = ED_space_clip_get_clip_frame_number(sc);
 
 	if (tdt->mode == transDataTracking_ModeTracks) {
 		track = tracksbase->first;
@@ -5992,7 +5992,7 @@ void flushTransTracking(TransInfo *t)
 	int a;
 	float aspx, aspy;
 
-	ED_space_clip_aspect_dimension_aware(sc, &aspx, &aspy);
+	ED_space_clip_get_clip_aspect_dimension_aware(sc, &aspx, &aspy);
 
 	if (t->state == TRANS_CANCEL)
 		cancelTransTracking(t);
@@ -6072,7 +6072,7 @@ static void MaskPointToTransData(SpaceClip *sc, MaskSplinePoint *point,
 	tdm->point = point;
 	copy_m3_m3(tdm->vec, bezt->vec);
 
-	ED_space_clip_mask_aspect(sc, &aspx, &aspy);
+	ED_space_clip_get_mask_aspect(sc, &aspx, &aspy);
 
 	if (propmode || is_sel_point) {
 		int i;
@@ -6250,7 +6250,7 @@ void flushTransMasking(TransInfo *t)
 	int a;
 	float aspx, aspy, invx, invy;
 
-	ED_space_clip_mask_aspect(sc, &aspx, &aspy);
+	ED_space_clip_get_mask_aspect(sc, &aspx, &aspy);
 	invx = 1.0f / aspx;
 	invy = 1.0f / aspy;