diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/mask/mask_relationships.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/editors/mask/mask_relationships.c')
-rw-r--r-- | source/blender/editors/mask/mask_relationships.c | 251 |
1 files changed, 126 insertions, 125 deletions
diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c index d7dfcc64ab0..bb9359bad71 100644 --- a/source/blender/editors/mask/mask_relationships.c +++ b/source/blender/editors/mask/mask_relationships.c @@ -21,7 +21,6 @@ * \ingroup edmask */ - #include "BLI_math.h" #include "BLI_string.h" @@ -37,157 +36,159 @@ #include "WM_types.h" #include "ED_screen.h" -#include "ED_clip.h" /* frame remapping functions */ +#include "ED_clip.h" /* frame remapping functions */ -#include "mask_intern.h" /* own include */ +#include "mask_intern.h" /* own include */ static int mask_parent_clear_exec(bContext *C, wmOperator *UNUSED(op)) { - Mask *mask = CTX_data_edit_mask(C); - MaskLayer *masklay; + Mask *mask = CTX_data_edit_mask(C); + MaskLayer *masklay; - for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { - MaskSpline *spline; - int i; + for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { + MaskSpline *spline; + int i; - if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { - continue; - } + if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { + continue; + } - for (spline = masklay->splines.first; spline; spline = spline->next) { - for (i = 0; i < spline->tot_point; i++) { - MaskSplinePoint *point = &spline->points[i]; + for (spline = masklay->splines.first; spline; spline = spline->next) { + for (i = 0; i < spline->tot_point; i++) { + MaskSplinePoint *point = &spline->points[i]; - if (MASKPOINT_ISSEL_ANY(point)) { - point->parent.id = NULL; - } - } - } - } + if (MASKPOINT_ISSEL_ANY(point)) { + point->parent.id = NULL; + } + } + } + } - WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); - DEG_id_tag_update(&mask->id, 0); + WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); + DEG_id_tag_update(&mask->id, 0); - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } void MASK_OT_parent_clear(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Clear Parent"; - ot->description = "Clear the mask's parenting"; - ot->idname = "MASK_OT_parent_clear"; + /* identifiers */ + ot->name = "Clear Parent"; + ot->description = "Clear the mask's parenting"; + ot->idname = "MASK_OT_parent_clear"; - /* api callbacks */ - ot->exec = mask_parent_clear_exec; + /* api callbacks */ + ot->exec = mask_parent_clear_exec; - ot->poll = ED_maskedit_mask_poll; + ot->poll = ED_maskedit_mask_poll; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op)) { - Mask *mask = CTX_data_edit_mask(C); - MaskLayer *masklay; - - /* parent info */ - SpaceClip *sc = CTX_wm_space_clip(C); - MovieClip *clip = ED_space_clip_get_clip(sc); - MovieTracking *tracking; - MovieTrackingTrack *track; - MovieTrackingPlaneTrack *plane_track; - MovieTrackingObject *tracking_object; - /* done */ - - int framenr, parent_type; - float parmask_pos[2], orig_corners[4][2]; - const char *sub_parent_name; - - if (ELEM(NULL, sc, clip)) { - return OPERATOR_CANCELLED; - } - - framenr = ED_space_clip_get_clip_frame_number(sc); - - tracking = &clip->tracking; - tracking_object = BKE_tracking_object_get_active(&clip->tracking); - - if (tracking_object == NULL) { - return OPERATOR_CANCELLED; - } - - if ((track = BKE_tracking_track_get_active(tracking)) != NULL) { - MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr); - float marker_pos_ofs[2]; - - add_v2_v2v2(marker_pos_ofs, marker->pos, track->offset); - - BKE_mask_coord_from_movieclip(clip, &sc->user, parmask_pos, marker_pos_ofs); - - sub_parent_name = track->name; - parent_type = MASK_PARENT_POINT_TRACK; - memset(orig_corners, 0, sizeof(orig_corners)); - } - else if ((plane_track = BKE_tracking_plane_track_get_active(tracking)) != NULL) { - MovieTrackingPlaneMarker *plane_marker = BKE_tracking_plane_marker_get(plane_track, framenr); - - zero_v2(parmask_pos); - sub_parent_name = plane_track->name; - parent_type = MASK_PARENT_PLANE_TRACK; - memcpy(orig_corners, plane_marker->corners, sizeof(orig_corners)); - } - else { - return OPERATOR_CANCELLED; - } - - for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { - MaskSpline *spline; - int i; - - if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { - continue; - } - - for (spline = masklay->splines.first; spline; spline = spline->next) { - for (i = 0; i < spline->tot_point; i++) { - MaskSplinePoint *point = &spline->points[i]; - - if (MASKPOINT_ISSEL_ANY(point)) { - point->parent.id_type = ID_MC; - point->parent.id = &clip->id; - point->parent.type = parent_type; - BLI_strncpy(point->parent.parent, tracking_object->name, sizeof(point->parent.parent)); - BLI_strncpy(point->parent.sub_parent, sub_parent_name, sizeof(point->parent.sub_parent)); - - copy_v2_v2(point->parent.parent_orig, parmask_pos); - memcpy(point->parent.parent_corners_orig, orig_corners, sizeof(point->parent.parent_corners_orig)); - } - } - } - } - - WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); - DEG_id_tag_update(&mask->id, 0); - - return OPERATOR_FINISHED; + Mask *mask = CTX_data_edit_mask(C); + MaskLayer *masklay; + + /* parent info */ + SpaceClip *sc = CTX_wm_space_clip(C); + MovieClip *clip = ED_space_clip_get_clip(sc); + MovieTracking *tracking; + MovieTrackingTrack *track; + MovieTrackingPlaneTrack *plane_track; + MovieTrackingObject *tracking_object; + /* done */ + + int framenr, parent_type; + float parmask_pos[2], orig_corners[4][2]; + const char *sub_parent_name; + + if (ELEM(NULL, sc, clip)) { + return OPERATOR_CANCELLED; + } + + framenr = ED_space_clip_get_clip_frame_number(sc); + + tracking = &clip->tracking; + tracking_object = BKE_tracking_object_get_active(&clip->tracking); + + if (tracking_object == NULL) { + return OPERATOR_CANCELLED; + } + + if ((track = BKE_tracking_track_get_active(tracking)) != NULL) { + MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr); + float marker_pos_ofs[2]; + + add_v2_v2v2(marker_pos_ofs, marker->pos, track->offset); + + BKE_mask_coord_from_movieclip(clip, &sc->user, parmask_pos, marker_pos_ofs); + + sub_parent_name = track->name; + parent_type = MASK_PARENT_POINT_TRACK; + memset(orig_corners, 0, sizeof(orig_corners)); + } + else if ((plane_track = BKE_tracking_plane_track_get_active(tracking)) != NULL) { + MovieTrackingPlaneMarker *plane_marker = BKE_tracking_plane_marker_get(plane_track, framenr); + + zero_v2(parmask_pos); + sub_parent_name = plane_track->name; + parent_type = MASK_PARENT_PLANE_TRACK; + memcpy(orig_corners, plane_marker->corners, sizeof(orig_corners)); + } + else { + return OPERATOR_CANCELLED; + } + + for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { + MaskSpline *spline; + int i; + + if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { + continue; + } + + for (spline = masklay->splines.first; spline; spline = spline->next) { + for (i = 0; i < spline->tot_point; i++) { + MaskSplinePoint *point = &spline->points[i]; + + if (MASKPOINT_ISSEL_ANY(point)) { + point->parent.id_type = ID_MC; + point->parent.id = &clip->id; + point->parent.type = parent_type; + BLI_strncpy(point->parent.parent, tracking_object->name, sizeof(point->parent.parent)); + BLI_strncpy(point->parent.sub_parent, sub_parent_name, sizeof(point->parent.sub_parent)); + + copy_v2_v2(point->parent.parent_orig, parmask_pos); + memcpy(point->parent.parent_corners_orig, + orig_corners, + sizeof(point->parent.parent_corners_orig)); + } + } + } + } + + WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); + DEG_id_tag_update(&mask->id, 0); + + return OPERATOR_FINISHED; } /** based on #OBJECT_OT_parent_set */ void MASK_OT_parent_set(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Make Parent"; - ot->description = "Set the mask's parenting"; - ot->idname = "MASK_OT_parent_set"; + /* identifiers */ + ot->name = "Make Parent"; + ot->description = "Set the mask's parenting"; + ot->idname = "MASK_OT_parent_set"; - /* api callbacks */ - //ot->invoke = mask_parent_set_invoke; - ot->exec = mask_parent_set_exec; + /* api callbacks */ + //ot->invoke = mask_parent_set_invoke; + ot->exec = mask_parent_set_exec; - ot->poll = ED_space_clip_maskedit_mask_poll; + ot->poll = ED_space_clip_maskedit_mask_poll; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } |