diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-29 10:58:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-29 10:58:16 +0400 |
| commit | 5380545c9780c8aabf050f0bdd4a547f45d9794e (patch) | |
| tree | 0dca31a32af4cf3b6c53ab984a856dbf224c4931 /release | |
| parent | e3c6e47a382e6a8c92482cda048b396e0e9cc581 (diff) | |
| parent | 3f57c06c7b8f01e16109c8bdbaba9643fe380d3c (diff) | |
svn merge ^/trunk/blender -r42221:42245
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 12 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_info.py | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index d5171d119f7..89e15fec828 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -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="") diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index eaf88fbd295..ab8975d60e8 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -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() |