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

svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again

Browse Source
This commit is contained in:
Campbell Barton
2011-10-14 01:49:37 +00:00
parent 4e118bb22f 9e17ecf010
commit 9f8608a8ec
54 changed files with 1539 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/startup/bl_ui/properties_data_curve.py
View File

@@ -259,10 +259,11 @@ class DATA_PT_active_spline(CurveButtonsPanelActive, Panel):
if not is_surf:
split = layout.split()
col = split.column()
col.active = (curve.dimensions == '3D')
col.label(text="Interpolation:")
col.prop(act_spline, "tilt_interpolation", text="Tilt")
colsub = col.column()
colsub.active = (curve.dimensions == '3D')
colsub.prop(act_spline, "tilt_interpolation", text="Tilt")
col.prop(act_spline, "radius_interpolation", text="Radius")
layout.prop(act_spline, "use_smooth")

3
release/scripts/startup/bl_ui/space_sequencer.py
View File

@@ -60,7 +60,6 @@ class SEQUENCER_HT_header(Header):
layout.separator()
layout.operator("sequencer.refresh_all")
layout.template_running_jobs()
elif st.view_type == 'SEQUENCER_PREVIEW':
layout.separator()
layout.operator("sequencer.refresh_all")
@@ -76,6 +75,8 @@ class SEQUENCER_HT_header(Header):
row.prop(ed, "overlay_frame", text="")
row.prop(ed, "overlay_lock", text="", icon='LOCKED')
layout.template_running_jobs()
class SEQUENCER_MT_view_toggle(Menu):
bl_label = "View Type"