griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tomato: fixes for marker sliding operator

Browse Source 
- Fixed crash on slide undo. Was caused by some typos in slide
  data initialization and not checking for slide action in
  cancel callback
- Always create keyframe for frame when marker is stared sliding.
This commit is contained in:
Sergey Sharybin
2012-05-15 15:05:45 +00:00
parent 3e4e7bfc42
commit e5927b8cc5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_clip/tracking_ops.c
View File

@@ -315,7 +315,7 @@ static SlideMarkerData *create_slide_marker_data(SpaceClip *sc, MovieTrackingTra
}
if ((area == TRACK_AREA_SEARCH) ||
(area == TRACK_AREA_PAT && !ELEM(action, SLIDE_ACTION_OFFSET, SLIDE_ACTION_POS)))
(area == TRACK_AREA_PAT && action != SLIDE_ACTION_OFFSET))
{
if (data->corners) {
memcpy(data->scorners, data->corners, sizeof(data->scorners));
@@ -591,7 +591,9 @@ static void cancel_mouse_slide(SlideMarkerData *data)
copy_v2_v2(data->pos, data->spos);
}
else {
if (data->action == SLIDE_ACTION_SIZE) {
if ((data->action == SLIDE_ACTION_SIZE) ||
(data->action == SLIDE_ACTION_POS && data->area == TRACK_AREA_PAT))
{
if (data->corners) {
memcpy(data->corners, data->scorners, sizeof(data->scorners));
}
@@ -663,8 +665,6 @@ static int slide_marker_modal(bContext *C, wmOperator *op, wmEvent *event)
else {
data->pos[0] = data->spos[0] + dx;
data->pos[1] = data->spos[1] + dy;
data->marker->flag &= ~MARKER_TRACKED;
}
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
@@ -734,6 +734,8 @@ static int slide_marker_modal(bContext *C, wmOperator *op, wmEvent *event)
}
}
data->marker->flag &= ~MARKER_TRACKED;
WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, NULL);
break;