Masking: Numpad-. now centers view to selected control points

Currently feather points are being ignored, it could be improved in the future.

4 files changed, 93 insertions, 5 deletions

diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h
index 1611276ca70..1f13b46ff2a 100644
--- a/source/blender/editors/include/ED_mask.h
+++ b/source/blender/editors/include/ED_mask.h
@@ -31,6 +31,7 @@
 #ifndef __ED_MASK_H__
 #define __ED_MASK_H__
 
+struct bContext;
 struct wmKeyConfig;
 struct MaskLayer;
 struct MaskLayerShape;
@@ -48,6 +49,7 @@ void ED_mask_point_pos__reverse(struct ScrArea *sa, struct ARegion *ar,
                                 float x, float y, float *xr, float *yr);
 
 void ED_mask_cursor_location_get(struct ScrArea *sa, float cursor[2]);
+bool ED_mask_selected_minmax(const struct bContext *C, float min[2], float max[2]);
 
 void ED_operatortypes_mask(void);
 void ED_keymap_mask(struct wmKeyConfig *keyconf);
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c
index e2eb32e86d9..38ca22a92cb 100644
--- a/source/blender/editors/mask/mask_edit.c
+++ b/source/blender/editors/mask/mask_edit.c
@@ -35,6 +35,7 @@
 #include "BKE_context.h"
 #include "BKE_mask.h"
 
+#include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 
 #include "WM_api.h"
@@ -397,6 +398,58 @@ void ED_mask_cursor_location_get(ScrArea *sa, float cursor[2])
 	}
 }
 
+bool ED_mask_selected_minmax(const bContext *C, float min[2], float max[2])
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *mask_layer;
+	bool ok = false;
+	INIT_MINMAX2(min, max);
+	for (mask_layer = mask->masklayers.first;
+	     mask_layer != NULL;
+	     mask_layer = mask_layer->next)
+	{
+		MaskSpline *spline;
+		if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW|MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+		for (spline = mask_layer->splines.first;
+		     spline != NULL;
+		     spline = spline->next)
+		{
+			MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+			int i;
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+				MaskSplinePoint *deform_point = &points_array[i];
+				BezTriple *bezt = &point->bezt;
+				float handle[2];
+				if (!MASKPOINT_ISSEL_ANY(point)) {
+					continue;
+				}
+				if (bezt->f2 & SELECT) {
+					minmax_v2v2_v2(min, max, deform_point->bezt.vec[1]);
+				}
+				if (BKE_mask_point_handles_mode_get(point) == MASK_HANDLE_MODE_STICK) {
+					BKE_mask_point_handle(deform_point, MASK_WHICH_HANDLE_STICK, handle);
+					minmax_v2v2_v2(min, max, handle);
+				}
+				else {
+					if ((bezt->f1 & SELECT) && (bezt->h1 != HD_VECT)) {
+						BKE_mask_point_handle(deform_point, MASK_WHICH_HANDLE_LEFT, handle);
+						minmax_v2v2_v2(min, max, handle);
+					}
+					if ((bezt->f3 & SELECT) && (bezt->h2 != HD_VECT)) {
+						BKE_mask_point_handle(deform_point, MASK_WHICH_HANDLE_RIGHT, handle);
+						minmax_v2v2_v2(min, max, handle);
+					}
+				}
+				ok = true;
+			}
+		}
+	}
+	return ok;
+}
+
 /********************** registration *********************/
 
 void ED_operatortypes_mask(void)
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 2e3326000ca..dbedfaa1de4 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -52,6 +52,7 @@
 
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BKE_mask.h"
 #include "BKE_movieclip.h"
 #include "BKE_context.h"
 #include "BKE_tracking.h"
@@ -64,6 +65,7 @@
 
 #include "ED_screen.h"
 #include "ED_clip.h"
+#include "ED_mask.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -330,7 +332,7 @@ void ED_clip_update_frame(const Main *mainp, int cfra)
 	}
 }
 
-static bool selected_boundbox(SpaceClip *sc, float min[2], float max[2])
+static bool selected_tracking_boundbox(SpaceClip *sc, float min[2], float max[2])
 {
 	MovieClip *clip = ED_space_clip_get_clip(sc);
 	MovieTrackingTrack *track;
@@ -378,6 +380,29 @@ static bool selected_boundbox(SpaceClip *sc, float min[2], float max[2])
 	return ok;
 }
 
+static bool selected_boundbox(const bContext *C, float min[2], float max[2])
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	if (sc->mode == SC_MODE_TRACKING) {
+		return selected_tracking_boundbox(sc, min, max);
+	}
+	else {
+		if (ED_mask_selected_minmax(C, min, max)) {
+			MovieClip *clip = ED_space_clip_get_clip(sc);
+			int width, height;
+			ED_space_clip_get_size(sc, &width, &height);
+			BKE_mask_coord_to_movieclip(clip, &sc->user, min, min);
+			BKE_mask_coord_to_movieclip(clip, &sc->user, max, max);
+			min[0] *= width;
+			min[1] *= height;
+			max[0] *= width;
+			max[1] *= height;
+			return true;
+		}
+		return false;
+	}
+}
+
 bool ED_clip_view_selection(const bContext *C, ARegion *ar, bool fit)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
@@ -389,7 +414,7 @@ bool ED_clip_view_selection(const bContext *C, ARegion *ar, bool fit)
 	if ((frame_width == 0) || (frame_height == 0) || (sc->clip == NULL))
 		return false;
 
-	if (!selected_boundbox(sc, min, max))
+	if (!selected_boundbox(C, min, max))
 		return false;
 
 	/* center view */
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index ca2f19cde91..8c840c0f6b5 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -85,6 +85,7 @@
 #include "RNA_enum_types.h"
 
 #include "ED_image.h"
+#include "ED_mask.h"
 #include "ED_paint.h"
 #include "ED_render.h"
 #include "ED_screen.h"
@@ -754,8 +755,15 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 	height = height * aspy;
 
 	/* get bounds */
-	if (!ED_uvedit_minmax(scene, ima, obedit, min, max))
-		return OPERATOR_CANCELLED;
+	if (ED_space_image_show_uvedit(sima, obedit)) {
+		if (!ED_uvedit_minmax(scene, ima, obedit, min, max))
+			return OPERATOR_CANCELLED;
+	}
+	else if (ED_space_image_check_show_maskedit(scene, sima)) {
+		if (!ED_mask_selected_minmax(C, min, max)) {
+			return OPERATOR_CANCELLED;
+		}
+	}
 
 	/* adjust offset and zoom */
 	sima->xof = (int)(((min[0] + max[0]) * 0.5f - 0.5f) * width);
@@ -775,7 +783,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 
 static int image_view_selected_poll(bContext *C)
 {
-	return (space_image_main_area_poll(C) && ED_operator_uvedit(C));
+	return (space_image_main_area_poll(C) && (ED_operator_uvedit(C) || ED_operator_mask(C)));
 }
 
 void IMAGE_OT_view_selected(wmOperatorType *ot)