Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-03 20:31:46 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-03 20:31:46 +0400
commita2c182e9233333fc3b8ff40d352113ec95e7e30c (patch)
tree37a9e08f4e6c4bf794aa0c8c15af875299db4a1b /source/blender/editors/space_clip
parent86cec98f9e1523ed41b67ef998174289dbae9b83 (diff)
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c10
-rw-r--r--source/blender/editors/space_clip/space_clip.c2
-rw-r--r--source/blender/editors/space_clip/tracking_ops.c26
3 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 42c127df016..af2db9697b2 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -849,9 +849,9 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
/* ** find window pixel coordinates of origin ** */
/* UI_view2d_to_region_no_clip return integer values, this could
- lead to 1px flickering when view is locked to selection during playbeck.
- to avoid this flickering, calclate base point in the same way as it happens
- in UI_view2d_to_region_no_clip, but do it in floats here */
+ * lead to 1px flickering when view is locked to selection during playbeck.
+ * to avoid this flickering, calclate base point in the same way as it happens
+ * in UI_view2d_to_region_no_clip, but do it in floats here */
view2d_to_region_float(&ar->v2d, 0.0f, 0.0f, &x, &y);
@@ -940,7 +940,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
}
/* selected areas only, so selection wouldn't be overlapped by
- non-selected areas */
+ * non-selected areas */
track= tracksbase->first;
fp= marker_pos;
while(track) {
@@ -1318,7 +1318,7 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
if(onlyv2d) {
/* if manual calibration is used then grase pencil data is already
- drawed in draw_distortion */
+ * drawed in draw_distortion */
if((sc->flag&SC_MANUAL_CALIBRATION)==0 || sc->mode!=SC_MODE_DISTORTION) {
ibuf= ED_space_clip_get_buffer(sc);
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index 9edf4fab280..0b5cfbbc7d3 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -725,7 +725,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
MovieClip *clip= ED_space_clip(sc);
/* if trcking is in progress, we should sunchronize framenr from clipuser
- so latest tracked frame would be shown */
+ * so latest tracked frame would be shown */
if(clip && clip->tracking_context)
BKE_tracking_sync_user(&sc->user, clip->tracking_context);
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 18a5d8689c8..a88296a9729 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -334,7 +334,7 @@ static SlideMarkerData *create_slide_marker_data(SpaceClip *sc, MovieTrackingTra
}
/* corner = 0: right-bottom corner,
- corner = 1: left-top corner */
+ * corner = 1: left-top corner */
static int mouse_on_corner(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
int area, float co[2], int corner, int width, int height)
{
@@ -1328,10 +1328,10 @@ static int track_markers_initjob(bContext *C, TrackMarkersJob *tmj, int backward
tmj->lastfra= tmj->sfra;
/* XXX: silly to store this, but this data is needed to update scene and movieclip
- frame numbers when tracking is finished. This introduces better feedback for artists.
- Maybe there's another way to solve this problem, but can't think better way atm.
- Anyway, this way isn't more unstable as animation rendering animation
- which uses the same approach (except storing screen). */
+ * frame numbers when tracking is finished. This introduces better feedback for artists.
+ * Maybe there's another way to solve this problem, but can't think better way atm.
+ * Anyway, this way isn't more unstable as animation rendering animation
+ * which uses the same approach (except storing screen). */
tmj->scene= scene;
tmj->main= CTX_data_main(C);
tmj->screen= CTX_wm_screen(C);
@@ -1348,10 +1348,10 @@ static void track_markers_startjob(void *tmv, short *stop, short *do_update, flo
while(framenr != tmj->efra) {
if(tmj->delay>0) {
/* tracking should happen with fixed fps. Calculate time
- using current timer value before tracking frame and after.
-
- Small (and maybe unneeded optimization): do not calculate exec_time
- for "Fastest" tracking */
+ * using current timer value before tracking frame and after.
+ *
+ * Small (and maybe unneeded optimization): do not calculate exec_time
+ * for "Fastest" tracking */
double start_time= PIL_check_seconds_timer(), exec_time;
@@ -1493,9 +1493,9 @@ static int track_markers_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve
WM_jobs_customdata(steve, tmj, track_markers_freejob);
/* if there's delay set in tracking job, tracking should happen
- with fixed FPS. To deal with editor refresh we have to syncronize
- tracks from job and tracks in clip. Do this in timer callback
- to prevent threading conflicts. */
+ * with fixed FPS. To deal with editor refresh we have to syncronize
+ * tracks from job and tracks in clip. Do this in timer callback
+ * to prevent threading conflicts. */
if(tmj->delay>0) WM_jobs_timer(steve, tmj->delay/1000.0f, NC_MOVIECLIP|NA_EVALUATED, 0);
else WM_jobs_timer(steve, 0.2, NC_MOVIECLIP|NA_EVALUATED, 0);
@@ -3332,7 +3332,7 @@ static int is_track_clean(MovieTrackingTrack *track, int frames, int del)
}
else if(markers[a].flag&MARKER_DISABLED) {
/* current segment which would be deleted was finished by disabled marker,
- so next segment should be started from disabled marker */
+ * so next segment should be started from disabled marker */
start_disabled= 1;
}
}