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

svn merge ^/trunk/blender -r42466:42495

Browse Source
This commit is contained in:
Campbell Barton
2011-12-07 18:29:21 +00:00
parent 2a35e8f9c1 3637794436
commit b245dfbc06
26 changed files with 212 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
release/scripts/presets/tracking_settings/blurry_footage.py Normal file
View File

@@ -0,0 +1,11 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
settings.default_tracker = 'Hybrid'
settings.default_pyramid_levels = 2
settings.default_correlation_min = 0.75
settings.default_pattern_size = 21
settings.default_search_size = 100
settings.default_frames_limit = 0
settings.default_pattern_match = 'PREV_FRAME'
settings.default_margin = 0

11
release/scripts/presets/tracking_settings/blurry_movie.py
View File

@@ -1,11 +0,0 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
settings.default_tracker = 'KLT'
settings.default_pyramid_levels = 4
settings.default_correlation_min = 0.75
settings.default_pattern_size = 11
settings.default_search_size = 202
settings.default_frames_limit = 25
settings.default_pattern_match = 'KEYFRAME'
settings.default_margin = 0

4
release/scripts/presets/tracking_settings/default.py
View File

@@ -1,11 +1,11 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
settings.default_tracker = 'KLT'
settings.default_tracker = 'Hybrid'
settings.default_pyramid_levels = 2
settings.default_correlation_min = 0.75
settings.default_pattern_size = 11
settings.default_search_size = 51
settings.default_search_size = 61
settings.default_frames_limit = 0
settings.default_pattern_match = 'KEYFRAME'
settings.default_margin = 0

12
release/scripts/presets/tracking_settings/fast_motion.py
View File

@@ -1,11 +1,11 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
settings.default_tracker = 'KLT'
settings.default_tracker = 'Hybrid'
settings.default_pyramid_levels = 2
settings.default_correlation_min = 0.75
settings.default_pattern_size = 11
settings.default_search_size = 121
settings.default_correlation_min = 0.7
settings.default_pattern_size = 31
settings.default_search_size = 300
settings.default_frames_limit = 0
settings.default_pattern_match = 'KEYFRAME'
settings.default_margin = 0
settings.default_pattern_match = 'PREV_FRAME'
settings.default_margin = 5

6
release/scripts/startup/bl_ui/space_clip.py
View File

@@ -129,8 +129,7 @@ class CLIP_PT_tools_marker(Panel):
if settings.default_tracker == 'KLT':
col.prop(settings, "default_pyramid_levels")
elif settings.default_tracker == 'SAD':
col.prop(settings, "default_correlation_min")
col.prop(settings, "default_correlation_min")
col.separator()
@@ -497,8 +496,7 @@ class CLIP_PT_track_settings(Panel):
if active.tracker == 'KLT':
col.prop(active, "pyramid_levels")
elif active.tracker == 'SAD':
col.prop(active, "correlation_min")
col.prop(active, "correlation_min")
col.separator()
col.prop(active, "frames_limit")

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@@ -889,6 +889,8 @@ class USERPREF_PT_input(Panel, InputKeyMapPanel):
sub.label(text="NDOF Device:")
sub.prop(inputs, "ndof_sensitivity", text="NDOF Sensitivity")
col.prop(inputs, "tweak_threshold")
row.separator()
def draw(self, context):

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -255,7 +255,7 @@ class VIEW3D_MT_uv_map(Menu):
layout.separator()
layout.operator_context = 'EXEC_DEFAULT'
layout.operator_context = 'EXEC_REGION_WIN'
layout.operator("uv.cube_project")
layout.operator("uv.cylinder_project")
layout.operator("uv.sphere_project")