archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Remove redundant marker clamping code path

Browse Source 
Pattern is expected to be freely resized to any size, and the search
area s to become bigger when needed.

Remove confusing pattern size clamping which was actually clamping
search area.

There should be no functional changes.
This commit is contained in:
Sergey Sharybin
2022-05-12 10:42:23 +02:00
parent a0e63bac02
commit 58fe38af9f
6 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_tracking.h
View File

@@ -33,7 +33,6 @@ struct rcti;
*/
enum {
CLAMP_PAT_DIM = 1,
CLAMP_PAT_POS = 2,
CLAMP_SEARCH_DIM = 3,
CLAMP_SEARCH_POS = 4,

9
source/blender/blenkernel/intern/tracking.c
View File

@@ -1373,14 +1373,7 @@ void BKE_tracking_marker_clamp(MovieTrackingMarker *marker, int event)
BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
if (event == CLAMP_PAT_DIM) {
for (int a = 0; a < 2; a++) {
/* search shouldn't be resized smaller than pattern */
marker->search_min[a] = min_ff(pat_min[a], marker->search_min[a]);
marker->search_max[a] = max_ff(pat_max[a], marker->search_max[a]);
}
}
else if (event == CLAMP_PAT_POS) {
if (event == CLAMP_PAT_POS) {
float dim[2];
sub_v2_v2v2(dim, pat_max, pat_min);

2
source/blender/editors/space_clip/clip_buttons.c
View File

@@ -303,7 +303,7 @@ static void marker_block_handler(bContext *C, void *arg_cb, int event)
cb->marker->pattern_corners[a][1] *= scale_y;
}
BKE_tracking_marker_clamp(cb->marker, CLAMP_PAT_DIM);
BKE_tracking_marker_clamp(cb->marker, CLAMP_SEARCH_DIM);
ok = true;
}

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

@@ -849,7 +849,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
}
BKE_tracking_marker_clamp(data->marker, CLAMP_PAT_DIM);
BKE_tracking_marker_clamp(data->marker, CLAMP_SEARCH_DIM);
}
else if (data->action == SLIDE_ACTION_OFFSET) {
const float d[2] = {dx, dy};
@@ -873,7 +873,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event)
/* Currently only patterns are allowed to have such
* combination of event and data.
*/
BKE_tracking_marker_clamp(data->marker, CLAMP_PAT_DIM);
BKE_tracking_marker_clamp(data->marker, CLAMP_SEARCH_DIM);
}
else if (data->action == SLIDE_ACTION_TILT_SIZE) {
const float mouse_delta[2] = {dx, dy};
@@ -917,7 +917,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event)
data->corners[a][1] = (vec[1] * cosf(angle) + vec[0] * sinf(angle)) / data->height;
}
BKE_tracking_marker_clamp(data->marker, CLAMP_PAT_DIM);
BKE_tracking_marker_clamp(data->marker, CLAMP_SEARCH_DIM);
}
}
else if (data->area == TRACK_AREA_SEARCH) {

2
source/blender/editors/transform/transform_convert_tracking.c
View File

@@ -720,7 +720,7 @@ void recalcData_tracking(TransInfo *t)
}
else if (t->mode == TFM_RESIZE) {
if (TRACK_AREA_SELECTED(track, TRACK_AREA_PAT)) {
BKE_tracking_marker_clamp(marker, CLAMP_PAT_DIM);
BKE_tracking_marker_clamp(marker, CLAMP_SEARCH_DIM);
}
if (TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH)) {
BKE_tracking_marker_clamp(marker, CLAMP_SEARCH_DIM);

2
source/blender/makesrna/intern/rna_tracking.c
View File

@@ -557,7 +557,7 @@ static void rna_tracking_markerPattern_update(Main *UNUSED(bmain),
{
MovieTrackingMarker *marker = (MovieTrackingMarker *)ptr->data;
BKE_tracking_marker_clamp(marker, CLAMP_PAT_DIM);
BKE_tracking_marker_clamp(marker, CLAMP_SEARCH_DIM);
}
static void rna_tracking_markerSearch_update(Main *UNUSED(bmain),