remove duplicate code by adding a movieclip select

2 files changed, 12 insertions, 7 deletions

diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index b8aa1264632..07cd0eba978 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -617,6 +617,17 @@ MovieClip *ED_space_clip_get_secondary_clip(SpaceClip *sc)
 	return sc->secondary_clip;
 }
 
+MovieClip *ED_space_clip_get_clip_in_region(SpaceClip *sc, ARegion *ar)
+{
+	RegionSpaceClip *rsc = ar->regiondata;
+	if (rsc->flag == RSC_MAIN_CLIP) {
+		return ED_space_clip_get_clip(sc);
+	}
+	else {	//rsc->flag == RSC_SECONDARY_CLIP
+		return ED_space_clip_get_secondary_clip(sc);
+	}
+}
+
 void ED_space_clip_set_clip(bContext *C, bScreen *screen, SpaceClip *sc, MovieClip *clip)
 {
 	MovieClip *old_clip;
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index e3525dfee88..87999c5bc2d 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -1174,13 +1174,7 @@ static void clip_main_region_draw(const bContext *C, ARegion *ar)
 	/* draw entirely, view changes should be handled here */
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	RegionSpaceClip *rsc = CTX_wm_region_clip(C);
-	MovieClip *clip;
-	if (rsc->flag == RSC_MAIN_CLIP) {
-		clip = ED_space_clip_get_clip(sc);
-	}
-	else {
-		clip = ED_space_clip_get_secondary_clip(sc);
-	}
+	MovieClip *clip = ED_space_clip_get_clip_in_region(sc, ar);
 	float aspx, aspy, zoomx, zoomy, x, y;
 	int width, height;
 	bool show_cursor = false;