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.vfx@gmail.com>2012-01-26 19:33:16 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-01-26 19:33:16 +0400
commitbcbe9ca5fc09caf617a355c52a6368f9c889adbc (patch)
treed814c576d0b1a45c8b157d5e2a03136b87823b9b /release
parent6eb3d5cb50b3ca542b4705a41dbecd47d53d64f9 (diff)
Color channels used for tracking is now a part of default tracking settings and also a part of presets.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/presets/tracking_settings/blurry_footage.py3
-rw-r--r--release/scripts/presets/tracking_settings/default.py3
-rw-r--r--release/scripts/presets/tracking_settings/fast_motion.py3
-rw-r--r--release/scripts/startup/bl_operators/clip.py3
-rw-r--r--release/scripts/startup/bl_operators/presets.py5
-rw-r--r--release/scripts/startup/bl_ui/space_clip.py7
6 files changed, 23 insertions, 1 deletions
diff --git a/release/scripts/presets/tracking_settings/blurry_footage.py b/release/scripts/presets/tracking_settings/blurry_footage.py
index c805301df78..c06d4c3835b 100644
--- a/release/scripts/presets/tracking_settings/blurry_footage.py
+++ b/release/scripts/presets/tracking_settings/blurry_footage.py
@@ -9,3 +9,6 @@ settings.default_search_size = 100
settings.default_frames_limit = 0
settings.default_pattern_match = 'PREV_FRAME'
settings.default_margin = 0
+settings.use_default_red_channel = True
+settings.use_default_green_channel = True
+settings.use_default_blue_channel = True
diff --git a/release/scripts/presets/tracking_settings/default.py b/release/scripts/presets/tracking_settings/default.py
index 3846f92d828..b9fd1928472 100644
--- a/release/scripts/presets/tracking_settings/default.py
+++ b/release/scripts/presets/tracking_settings/default.py
@@ -9,3 +9,6 @@ settings.default_search_size = 61
settings.default_frames_limit = 0
settings.default_pattern_match = 'KEYFRAME'
settings.default_margin = 0
+settings.use_default_red_channel = True
+settings.use_default_green_channel = True
+settings.use_default_blue_channel = True
diff --git a/release/scripts/presets/tracking_settings/fast_motion.py b/release/scripts/presets/tracking_settings/fast_motion.py
index f99fd7f0c42..dce3304eddb 100644
--- a/release/scripts/presets/tracking_settings/fast_motion.py
+++ b/release/scripts/presets/tracking_settings/fast_motion.py
@@ -9,3 +9,6 @@ settings.default_search_size = 300
settings.default_frames_limit = 0
settings.default_pattern_match = 'PREV_FRAME'
settings.default_margin = 5
+settings.use_default_red_channel = True
+settings.use_default_green_channel = True
+settings.use_default_blue_channel = True
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index c5ea8176691..787f3be4e76 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -113,6 +113,9 @@ def CLIP_default_settings_from_track(clip, track):
settings.default_frames_limit = track.frames_limit
settings.default_pattern_match = track.pattern_match
settings.default_margin = track.margin
+ settings.use_default_red_channel = track.use_red_channel
+ settings.use_default_green_channel = track.use_green_channel
+ settings.use_default_blue_channel = track.use_blue_channel
class CLIP_OT_track_to_empty(Operator):
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index 0ba19ad8109..1aecfbbaa77 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -409,7 +409,10 @@ class AddPresetTrackingSettings(AddPresetBase, Operator):
"settings.default_search_size",
"settings.default_frames_limit",
"settings.default_pattern_match",
- "settings.default_margin"
+ "settings.default_margin",
+ "settings.use_default_red_channel",
+ "settings.use_default_green_channel",
+ "settings.use_default_blue_channel"
]
preset_subdir = "tracking_settings"
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 7c2e1a2007c..e7ccc1e624e 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -127,6 +127,13 @@ class CLIP_PT_tools_marker(Panel):
col.separator()
+ row = col.row(align=True)
+ row.prop(settings, "use_default_red_channel", text="R", toggle=True)
+ row.prop(settings, "use_default_green_channel", text="G", toggle=True)
+ row.prop(settings, "use_default_blue_channel", text="B", toggle=True)
+
+ col.separator()
+
sub = col.column(align=True)
sub.prop(settings, "default_pattern_size")
sub.prop(settings, "default_search_size")