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:
authorSergey Sharybin <sergey@blender.org>2022-03-08 11:52:47 +0300
committerSergey Sharybin <sergey@blender.org>2022-03-08 11:52:47 +0300
commit3d71a05a1de5ed48cc2931dba3917494efce7bd5 (patch)
tree06d974efaf2f2dfa4daa60ec69fa3100100eabbe /release
parent63ac1660c0503b2990c1b02aeb4e08ca81bf4e3b (diff)
parent2ddb53de5403fb02e4de053084b2d00b2372a122 (diff)
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_operators/clip.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index d83781b2ed8..23bf8a5cb60 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -107,8 +107,8 @@ def CLIP_default_settings_from_track(clip, track, framenr):
search[1] = search[1] * height
settings.default_correlation_min = track.correlation_min
- settings.default_pattern_size = max(pattern[0], pattern[1])
- settings.default_search_size = max(search[0], search[1])
+ settings.default_pattern_size = int(max(pattern[0], pattern[1]))
+ settings.default_search_size = int(max(search[0], search[1]))
settings.default_frames_limit = track.frames_limit
settings.default_pattern_match = track.pattern_match
settings.default_margin = track.margin