[Bf-blender-cvs] [bdd79ef] master: Tracking: Cleanup, use more strict code style
Sergey Sharybin
noreply at git.blender.org
Fri Jan 15 11:16:11 CET 2016
Commit: bdd79ef880ac26de4cef623518c845fa23892a90
Author: Sergey Sharybin
Date: Fri Jan 15 13:48:24 2016 +0500
Branches: master
https://developer.blender.org/rBbdd79ef880ac26de4cef623518c845fa23892a90
Tracking: Cleanup, use more strict code style
Should be no functional changes.
===================================================================
M source/blender/editors/space_clip/tracking_ops.c
===================================================================
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 3ff9fcf..088c316 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -163,28 +163,35 @@ void CLIP_OT_add_marker(wmOperatorType *ot)
/********************** add marker operator *********************/
-static int add_marker_at_click_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+static int add_marker_at_click_invoke(bContext *C,
+ wmOperator *op,
+ const wmEvent *UNUSED(event))
{
- ED_area_headerprint(CTX_wm_area(C), IFACE_("Use LMB click to define location where place the marker"));
+ ED_area_headerprint(
+ CTX_wm_area(C),
+ IFACE_("Use LMB click to define location where place the marker"));
- /* add modal handler for ESC */
+ /* Add modal handler for ESC. */
WM_event_add_modal_handler(C, op);
return OPERATOR_RUNNING_MODAL;
}
-static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
+static int add_marker_at_click_modal(bContext *C,
+ wmOperator *UNUSED(op),
+ const wmEvent *event)
{
- SpaceClip *sc = CTX_wm_space_clip(C);
- MovieClip *clip = ED_space_clip_get_clip(sc);
- ARegion *ar = CTX_wm_region(C);
- float pos[2];
-
switch (event->type) {
case MOUSEMOVE:
return OPERATOR_RUNNING_MODAL;
case LEFTMOUSE:
+ {
+ SpaceClip *sc = CTX_wm_space_clip(C);
+ MovieClip *clip = ED_space_clip_get_clip(sc);
+ ARegion *ar = CTX_wm_region(C);
+ float pos[2];
+
ED_area_headerprint(CTX_wm_area(C), NULL);
ED_clip_point_stable_pos(sc, ar,
@@ -192,11 +199,13 @@ static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const
event->y - ar->winrct.ymin,
&pos[0], &pos[1]);
- if (!add_marker(C, pos[0], pos[1]))
+ if (!add_marker(C, pos[0], pos[1])) {
return OPERATOR_CANCELLED;
+ }
WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
return OPERATOR_FINISHED;
+ }
case ESCKEY:
ED_area_headerprint(CTX_wm_area(C), NULL);
@@ -229,15 +238,13 @@ static int delete_track_exec(bContext *C, wmOperator *UNUSED(op))
SpaceClip *sc = CTX_wm_space_clip(C);
MovieClip *clip = ED_space_clip_get_clip(sc);
MovieTracking *tracking = &clip->tracking;
- ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
- ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(tracking);
- MovieTrackingTrack *track = tracksbase->first, *next;
- MovieTrackingPlaneTrack *plane_track, *next_plane_track;
bool changed = false;
/* Delete selected plane tracks. */
- for (plane_track = plane_tracks_base->first;
- plane_track;
+ ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(tracking);
+ for (MovieTrackingPlaneTrack *plane_track = plane_tracks_base->first,
+ *next_plane_track;
+ plane_track != NULL;
plane_track = next_plane_track)
{
next_plane_track = plane_track->next;
@@ -249,23 +256,27 @@ static int delete_track_exec(bContext *C, wmOperator *UNUSED(op))
}
}
- /* Remove selected point tracks (they'll also be removed from planes which uses them). */
- while (track) {
- next = track->next;
-
+ /* Remove selected point tracks (they'll also be removed from planes which
+ * uses them).
+ */
+ ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+ for (MovieTrackingTrack *track = tracksbase->first, *next_track;
+ track != NULL;
+ track = next_track)
+ {
+ next_track = track->next;
if (TRACK_VIEW_SELECTED(sc, track)) {
clip_delete_track(C, clip, track);
changed = true;
}
-
- track = next;
}
- /* nothing selected now, unlock view so it can be scrolled nice again */
+ /* Nothing selected now, unlock view so it can be scrolled nice again. */
sc->flag &= ~SC_LOCK_SELECTION;
- if (changed)
+ if (changed) {
WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
+ }
return OPERATOR_FINISHED;
}
@@ -292,41 +303,38 @@ static int delete_marker_exec(bContext *C, wmOperator *UNUSED(op))
{
SpaceClip *sc = CTX_wm_space_clip(C);
MovieClip *clip = ED_space_clip_get_clip(sc);
- ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
- ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(&clip->tracking);
- MovieTrackingTrack *track = tracksbase->first, *next;
- MovieTrackingPlaneTrack *plane_track, *plane_track_next;
- int framenr = ED_space_clip_get_clip_frame_number(sc);
+ MovieTracking *tracking = &clip->tracking;
+ const int framenr = ED_space_clip_get_clip_frame_number(sc);
bool has_selection = false;
bool changed = false;
- while (track) {
- next = track->next;
-
+ ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+ for (MovieTrackingTrack *track = tracksbase->first, *next_track;
+ track != NULL;
+ track = next_track)
+ {
+ next_track = track->next;
if (TRACK_VIEW_SELECTED(sc, track)) {
MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
-
- if (marker) {
+ if (marker != NULL) {
has_selection |= track->markersnr > 1;
-
clip_delete_marker(C, clip, track, marker);
changed = true;
}
}
-
- track = next;
}
- for (plane_track = plane_tracks_base->first;
- plane_track;
+ ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(tracking);
+ for (MovieTrackingPlaneTrack *plane_track = plane_tracks_base->first,
+ *plane_track_next;
+ plane_track != NULL;
plane_track = plane_track_next)
{
plane_track_next = plane_track->next;
-
if (PLANE_TRACK_VIEW_SELECTED(plane_track)) {
- MovieTrackingPlaneMarker *plane_marker = BKE_tracking_plane_marker_get_exact(plane_track, framenr);
-
- if (plane_marker) {
+ MovieTrackingPlaneMarker *plane_marker =
+ BKE_tracking_plane_marker_get_exact(plane_track, framenr);
+ if (plane_marker != NULL) {
if (plane_track->markersnr == 1) {
BKE_tracking_plane_track_free(plane_track);
BLI_freelinkN(plane_tracks_base, plane_track);
@@ -334,19 +342,19 @@ static int delete_marker_exec(bContext *C, wmOperator *UNUSED(op))
else {
BKE_tracking_plane_marker_delete(plane_track, framenr);
}
-
changed = true;
}
}
}
if (!has_selection) {
- /* nothing selected now, unlock view so it can be scrolled nice again */
+ /* Nothing selected now, unlock view so it can be scrolled nice again. */
sc->flag &= ~SC_LOCK_SELECTION;
}
- if (!changed)
+ if (!changed) {
return OPERATOR_CANCELLED;
+ }
return OPERATOR_FINISHED;
}
@@ -369,10 +377,12 @@ void CLIP_OT_delete_marker(wmOperatorType *ot)
/********************** slide marker operator *********************/
-#define SLIDE_ACTION_POS 0
-#define SLIDE_ACTION_SIZE 1
-#define SLIDE_ACTION_OFFSET 2
-#define SLIDE_ACTION_TILT_SIZE 3
+enum {
+ SLIDE_ACTION_POS = 0,
+ SLIDE_ACTION_SIZE,
+ SLIDE_ACTION_OFFSET,
+ SLIDE_ACTION_TILT_SIZE,
+};
typedef struct {
short area, action;
@@ -386,7 +396,7 @@ typedef struct {
bool lock, accurate;
- /* data to restore on cancel */
+ /* Data to restore on cancel. */
float old_search_min[2], old_search_max[2], old_pos[2], old_offset[2];
float old_corners[4][2];
float (*old_markers)[2];
@@ -399,9 +409,15 @@ static void slide_marker_tilt_slider(const MovieTrackingMarker *marker,
add_v2_v2(r_slider, marker->pos);
}
-static SlideMarkerData *create_slide_marker_data(SpaceClip *sc, MovieTrackingTrack *track,
- MovieTrackingMarker *marker, const wmEvent *event,
- int area, int corner, int action, int width, int height)
+static SlideMarkerData *create_slide_marker_data(SpaceClip *sc,
+ MovieTrackingTrack *track,
+ MovieTrackingMarker *marker,
+ const wmEvent *event,
+ int area,
+ int corner,
+ int action,
+ int width,
+ int height)
{
SlideMarkerData *data = MEM_callocN(sizeof(SlideMarkerData), "slide marker data");
int framenr = ED_space_clip_get_clip_frame_number(sc);
@@ -422,14 +438,14 @@ static SlideMarkerData *create_slide_marker_data(SpaceClip *sc, MovieTrackingTra
data->corners = marker->pattern_corners;
}
else if (action == SLIDE_ACTION_OFFSET) {
- int a;
-
data->pos = marker->pos;
data->offset = track->offset;
-
- data->old_markers = MEM_callocN(sizeof(*data->old_markers) * track->markersnr, "slide marekrs");
- for (a = 0; a < track->markersnr; a++)
+ data->old_markers = MEM_callocN(
+ sizeof(*data->old_markers) * track->markersnr,
+ "slide marekrs");
+ for (int a = 0; a < track->markersnr; a++) {
copy_v2_v2(data->old_markers[a], track->markers[a].pos);
+ }
}
else if (action == SLIDE_ACTION_POS) {
data->corners = marker->pattern_corners;
@@ -452,10 +468,11 @@ static SlideMarkerData *create_slide_marker_data(SpaceClip *sc, MovieTrackingTra
data->width = width;
data->height = height;
- if (action == SLIDE_ACTION_SIZE)
+ if (action == SLIDE_ACTION_SIZE) {
data->lock = true;
+ }
- /* backup marker's settings */
+ /* Backup marker's settings. */
memcpy(data->old_corners, marker->pattern_corners, sizeof(data->old_corners));
copy_v2_v2(data->old_search_min, marker->search_min);
copy_v2_v2(data->old_search_max, marker->search_max);
@@ -763,16 +780,24 @@ static void *slide_marker_customdata(bContext *C, const wmEvent *event)
ED_space_clip_get_size(sc, &width, &height);
- if (width == 0 || height == 0)
+ if (width == 0 || height == 0) {
return NULL;
+ }
ED_clip_mous
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list