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

svn merge ^/trunk/blender -r42221:42245

Browse Source
This commit is contained in:
Campbell Barton
2011-11-29 06:58:16 +00:00
parent e3c6e47a38 3f57c06c7b
commit 5380545c97
11 changed files with 100 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,9 +120,9 @@ class CLIP_PT_tools_marker(Panel):
col.separator()
col2 = col.column(align=True)
col2.prop(settings, "default_pattern_size")
col2.prop(settings, "default_search_size")
sub = col.column(align=True)
sub.prop(settings, "default_pattern_size")
sub.prop(settings, "default_search_size")
col.label(text="Tracker:")
col.prop(settings, "default_tracker", text="")
@@ -134,9 +134,9 @@ class CLIP_PT_tools_marker(Panel):
col.separator()
col2 = col.column(align=True)
col2.prop(settings, "default_frames_limit")
col2.prop(settings, "default_margin")
sub = col.column(align=True)
sub.prop(settings, "default_frames_limit")
sub.prop(settings, "default_margin")
col.label(text="Match:")
col.prop(settings, "default_pattern_match", text="")

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

@@ -361,7 +361,7 @@ class INFO_MT_help(Menu):
layout = self.layout
layout.operator("wm.url_open", text="Manual", icon='HELP').url = 'http://wiki.blender.org/index.php/Doc:Manual'
layout.operator("wm.url_open", text="Manual", icon='HELP').url = 'http://wiki.blender.org/index.php/Doc:2.6/Manual'
layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-260/'
layout.separator()