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
path: root/release
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-06 02:13:10 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-06 02:13:10 +0400
commit3937ec7d11996438c2c6bd65d1d88f72431b1d52 (patch)
treee0a2104d51f1a44de88047a0e9d17d8492b343b1 /release
parent11d5a2d2eba127e2f8502e570addb08c22cbb9c1 (diff)
parent8f3170a17c270dd8a02f9b3bf2a971a65cab67ae (diff)
svn merge ^/trunk/blender -r43887:43918
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_clip.py49
-rw-r--r--release/scripts/startup/bl_ui/space_info.py2
-rw-r--r--release/text/readme.html10
3 files changed, 36 insertions, 25 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 8ebc1c450b4..eb97e546379 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -547,23 +547,15 @@ class CLIP_PT_display(Panel):
col = layout.column(align=True)
- col.prop(sc, "show_marker_pattern", text="Pattern")
- col.prop(sc, "show_marker_search", text="Search")
- col.prop(sc, "show_pyramid_levels", text="Pyramid")
-
- col.prop(sc, "show_track_path", text="Path")
- row = col.row()
- row.active = sc.show_track_path
- row.prop(sc, "path_length", text="Length")
-
col.prop(sc, "show_disabled", "Disabled Tracks")
+ col.prop(sc, "show_names", text="Names and Status")
col.prop(sc, "show_bundles", text="3D Markers")
- col.prop(sc, "show_names", text="Names and Status")
- col.prop(sc, "show_tiny_markers", text="Compact Markers")
+ col.prop(sc, "use_mute_footage", text="Mute Footage")
+ col.prop(sc, "lock_selection")
- col.prop(sc, "show_grease_pencil", text="Grease Pencil")
- col.prop(sc, "use_mute_footage", text="Mute")
+ if sc.view == 'GRAPH':
+ col.prop(sc, "lock_time_cursor")
if sc.mode == 'DISTORTION':
col.prop(sc, "show_grid", text="Grid")
@@ -571,15 +563,34 @@ class CLIP_PT_display(Panel):
elif sc.mode == 'RECONSTRUCTION':
col.prop(sc, "show_stable", text="Stable")
- col.prop(sc, "lock_selection")
-
- if sc.view == 'GRAPH':
- col.prop(sc, "lock_time_cursor")
-
clip = sc.clip
if clip:
col.label(text="Display Aspect Ratio:")
- col.prop(clip, "display_aspect", text="")
+ row = col.row()
+ row.prop(clip, "display_aspect", text="")
+
+
+class CLIP_PT_marker_display(Panel):
+ bl_space_type = 'CLIP_EDITOR'
+ bl_region_type = 'UI'
+ bl_label = "Marker Display"
+
+ def draw(self, context):
+ layout = self.layout
+ sc = context.space_data
+
+ col = layout.column(align=True)
+
+ row = col.row()
+ row.prop(sc, "show_marker_pattern", text="Pattern")
+ row.prop(sc, "show_marker_search", text="Search")
+
+ col.prop(sc, "show_tiny_markers", text="Thin Markers")
+ col.prop(sc, "show_track_path", text="Path")
+
+ row = col.row()
+ row.active = sc.show_track_path
+ row.prop(sc, "path_length", text="Length")
class CLIP_PT_track_settings(Panel):
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index fab422dfb43..f7636c87bd5 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -364,7 +364,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:2.6/Manual'
- layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-261/'
+ layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-262/'
layout.separator()
diff --git a/release/text/readme.html b/release/text/readme.html
index 0627624d2e7..a9f5e705b3d 100644
--- a/release/text/readme.html
+++ b/release/text/readme.html
@@ -12,18 +12,18 @@
</style>
</head>
<body>
-<p class="title"><b>Blender 2.61</b></p>
+<p class="title"><b>Blender 2.62</b></p>
<p><br></p>
<p class="header"><b>About</b></p>
<p class="body">Welcome to Blender, the free, open source 3D application for modeling, animation, rendering, compositing, video editing and game creation. Blender is available for Linux, Mac OS X, Windows, Solaris and FreeBSD and has a large world-wide community.</p>
<p class="body">Blender can be used freely for any purpose, including commercial use and distribution. It's free and open-source software, released under the GNU GPL licence. The entire source code is available on our website.</p>
<p class="body">For more information, visit <a href="http://www.blender.org">blender.org</a>.</p>
<p><br></p>
-<p class="header"><b>2.61</b></p>
-<p class="body">The Blender Foundation and online developer community is proud to present Blender 2.61. This release is the second official stable release of the Blender 2.6 series, in which we will refine the 2.5 series and add exciting new features again.<a href="http://www.blender.org/development/release-logs/blender-261/">More information about this release</a>.</p>
+<p class="header"><b>2.62</b></p>
+<p class="body">The Blender Foundation and online developer community is proud to present Blender 2.62. This release is the third official stable release of the Blender 2.6 series, in which we will refine the 2.5 series and add exciting new features again.<a href="http://www.blender.org/development/release-logs/blender-262/">More information about this release</a>.</p>
<p><br></p>
<p class="header"><b>Bugs</b></p>
-<p class="body">Although Blender 2.61 is considered a stable release, you may encounter a bug. If you do, please help us by posting it in the bug tracker or using Help → Report a Bug from inside Blender. If it wasn’t reported yet, please log in (or register) and fill in detailed information about the error. Please post detailed instructions on how to reproduce it or post a .blend file showcasing the bug.</p>
+<p class="body">Although Blender 2.62 is considered a stable release, you may encounter a bug. If you do, please help us by posting it in the bug tracker or using Help → Report a Bug from inside Blender. If it wasn’t reported yet, please log in (or register) and fill in detailed information about the error. Please post detailed instructions on how to reproduce it or post a .blend file showcasing the bug.</p>
<p><br></p>
<p class="header"><b>Package Contents</b></p>
<p class="body">The downloaded Blender package includes:</p>
@@ -47,7 +47,7 @@
<p class="header"><b>Links</b></p>
<p class="body">Users:</p>
<p class="body"> General information <a href="http://www.blender.org">www.blender.org</a> <br>
- Full release log <a href="http://www.blender.org/development/release-logs/blender-261/">www.blender.org/development/release-logs/blender-261/</a><br>
+ Full release log <a href="http://www.blender.org/development/release-logs/blender-262/">www.blender.org/development/release-logs/blender-262/</a><br>
Tutorials <a href="http://www.blender.org/education-help/">www.blender.org/education-help/</a> <br>
Manual <a href="http://wiki.blender.org/index.php/Doc:Manual">wiki.blender.org/index.php/Doc:Manual</a><br>
User Forum <a href="http://www.blenderartists.org">www.blenderartists.org</a><br>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 10:41:39 +0300