From 58fe38af9f0b4826acbacd7ccfdc39abc111f65c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 12 May 2022 10:42:23 +0200 Subject: Cleanup: Remove redundant marker clamping code path 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. --- source/blender/blenkernel/BKE_tracking.h | 1 - source/blender/blenkernel/intern/tracking.c | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h index 516e20d1d5d..1d4ff06703d 100644 --- a/source/blender/blenkernel/BKE_tracking.h +++ b/source/blender/blenkernel/BKE_tracking.h @@ -33,7 +33,6 @@ struct rcti; */ enum { - CLAMP_PAT_DIM = 1, CLAMP_PAT_POS = 2, CLAMP_SEARCH_DIM = 3, CLAMP_SEARCH_POS = 4, diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 7bb99551264..307e9eca8cb 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -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); -- cgit v1.2.3