diff options
Diffstat (limited to 'source/blender/editors/space_clip')
5 files changed, 27 insertions, 13 deletions
diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index ebe8e802a37..3f95dabf10a 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -184,19 +184,27 @@ void uiTemplateTrack(uiLayout *layout, PointerRNA *ptr, const char *propname) #define B_MARKER_FLAG 8 typedef struct { - int compact; /* compact mode */ + /** compact mode */ + int compact; MovieClip *clip; - MovieClipUser *user; /* user of clip */ + /** user of clip */ + MovieClipUser *user; MovieTrackingTrack *track; MovieTrackingMarker *marker; - int framenr; /* current frame number */ - float marker_pos[2]; /* position of marker in pixel coords */ - float marker_pat[2]; /* position and dimensions of marker pattern in pixel coords */ - float track_offset[2]; /* offset of "parenting" point */ - float marker_search_pos[2], marker_search[2]; /* position and dimensions of marker search in pixel coords */ - int marker_flag; /* marker's flags */ + /** current frame number */ + int framenr; + /** position of marker in pixel coords */ + float marker_pos[2]; + /** position and dimensions of marker pattern in pixel coords */ + float marker_pat[2]; + /** offset of "parenting" point */ + float track_offset[2]; + /** position and dimensions of marker search in pixel coords */ + float marker_search_pos[2], marker_search[2]; + /** marker's flags */ + int marker_flag; } MarkerUpdateCb; static void to_pixel_space(float r[2], float a[2], int width, int height) diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c index c05a4c1b64c..e2aa73d366d 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.c +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c @@ -310,7 +310,8 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar) v2d->tot.ymin = (float)(-height); } - /* need to do a view-sync here, so that the keys area doesn't jump around (it must copy this) */ + /* need to do a view-sync here, so that the keys area doesn't jump around + * (it must copy this) */ UI_view2d_sync(NULL, sa, v2d, V2D_LOCK_COPY); /* loop through channels, and set up drawing depending on their type diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 9f4983a35b2..dbfe11abf34 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -663,7 +663,8 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra GPU_line_width(1.0f); - /* Since we are switching solid and dashed lines in rather complex logic here, just always go with dashed shader. */ + /* Since we are switching solid and dashed lines in rather complex logic here, + * just always go with dashed shader. */ immUnbindProgram(); immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR); diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index 06233d64a36..119a57bffdc 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -241,7 +241,8 @@ static bool mouse_select_curve(bContext *C, float co[2], bool extend) if (userdata.track) { if (extend) { if (act_track == userdata.track) { - /* currently only single curve can be selected (selected curve represents active track) */ + /* currently only single curve can be selected + * (selected curve represents active track) */ act_track = NULL; } } diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index af7843a01a5..31a6ff5bc4b 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -581,9 +581,12 @@ static int clip_context(const bContext *C, const char *member, bContextDataResul /* dropboxes */ static bool clip_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event), const char **UNUSED(tooltip)) { - if (drag->type == WM_DRAG_PATH) - if (ELEM(drag->icon, 0, ICON_FILE_IMAGE, ICON_FILE_MOVIE, ICON_FILE_BLANK)) /* rule might not work? */ + if (drag->type == WM_DRAG_PATH) { + /* rule might not work? */ + if (ELEM(drag->icon, 0, ICON_FILE_IMAGE, ICON_FILE_MOVIE, ICON_FILE_BLANK)) { return true; + } + } return false; } |