Merged changes in the trunk up to revision 30167.

release/scripts/presets/cloth/cotton.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.cloth.settings.quality = 5
 bpy.context.cloth.settings.mass = 0.300
 bpy.context.cloth.settings.structural_stiffness = 15.000

release/scripts/presets/cloth/denim.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.cloth.settings.quality = 12
 bpy.context.cloth.settings.mass = 1
 bpy.context.cloth.settings.structural_stiffness = 40

release/scripts/presets/cloth/leather.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.cloth.settings.quality = 15
 bpy.context.cloth.settings.mass = 0.4
 bpy.context.cloth.settings.structural_stiffness = 80

release/scripts/presets/cloth/rubber.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.active_object.modifiers['Cloth'].settings.quality = 7
 bpy.context.active_object.modifiers['Cloth'].settings.mass = 3
 bpy.context.active_object.modifiers['Cloth'].settings.structural_stiffness = 15

release/scripts/presets/cloth/silk.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.cloth.settings.quality = 5
 bpy.context.cloth.settings.mass = 0.150
 bpy.context.cloth.settings.structural_stiffness = 5

release/scripts/presets/ffmpeg/DV.py

@@ -1,3 +1,4 @@
+import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
 bpy.context.scene.render.ffmpeg_format = "DV"

release/scripts/presets/ffmpeg/DVD.py

@@ -1,3 +1,4 @@
+import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
 bpy.context.scene.render.ffmpeg_format = "MPEG2"
@@ -15,4 +16,4 @@ bpy.context.scene.render.ffmpeg_maxrate = 9000
 bpy.context.scene.render.ffmpeg_minrate = 0
 bpy.context.scene.render.ffmpeg_buffersize = 224*8
 bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
+bpy.context.scene.render.ffmpeg_muxrate = 10080000

release/scripts/presets/ffmpeg/SVCD.py

@@ -1,3 +1,4 @@
+import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
 bpy.context.scene.render.ffmpeg_format = "MPEG2"
@@ -15,4 +16,4 @@ bpy.context.scene.render.ffmpeg_maxrate = 2516
 bpy.context.scene.render.ffmpeg_minrate = 0
 bpy.context.scene.render.ffmpeg_buffersize = 224*8
 bpy.context.scene.render.ffmpeg_packetsize = 2324
-bpy.context.scene.render.ffmpeg_muxrate = 0
+bpy.context.scene.render.ffmpeg_muxrate = 0

release/scripts/presets/ffmpeg/VCD.py

@@ -1,3 +1,4 @@
+import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
 bpy.context.scene.render.ffmpeg_format = "MPEG1"
@@ -15,4 +16,4 @@ bpy.context.scene.render.ffmpeg_maxrate = 1150
 bpy.context.scene.render.ffmpeg_minrate = 1150
 bpy.context.scene.render.ffmpeg_buffersize = 40*8
 bpy.context.scene.render.ffmpeg_packetsize = 2324
-bpy.context.scene.render.ffmpeg_muxrate = 2352 * 75 * 8
+bpy.context.scene.render.ffmpeg_muxrate = 2352 * 75 * 8

release/scripts/presets/ffmpeg/h264.py

@@ -1,3 +1,4 @@
+import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
 bpy.context.scene.render.ffmpeg_format = "H264"
@@ -13,4 +14,4 @@ bpy.context.scene.render.ffmpeg_maxrate = 9000
 bpy.context.scene.render.ffmpeg_minrate = 0
 bpy.context.scene.render.ffmpeg_buffersize = 224*8
 bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
+bpy.context.scene.render.ffmpeg_muxrate = 10080000

release/scripts/presets/ffmpeg/theora.py

@@ -1,3 +1,4 @@
+import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
 bpy.context.scene.render.ffmpeg_format = "OGG"
@@ -13,4 +14,4 @@ bpy.context.scene.render.ffmpeg_maxrate = 9000
 bpy.context.scene.render.ffmpeg_minrate = 0
 bpy.context.scene.render.ffmpeg_buffersize = 224*8
 bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
+bpy.context.scene.render.ffmpeg_muxrate = 10080000

release/scripts/presets/ffmpeg/xvid.py

@@ -1,3 +1,4 @@
+import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
 bpy.context.scene.render.ffmpeg_format = "AVI"
@@ -13,4 +14,4 @@ bpy.context.scene.render.ffmpeg_maxrate = 9000
 bpy.context.scene.render.ffmpeg_minrate = 0
 bpy.context.scene.render.ffmpeg_buffersize = 224*8
 bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
+bpy.context.scene.render.ffmpeg_muxrate = 10080000

release/scripts/presets/render/DVCPRO_HD_1080p.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 1280
 bpy.context.scene.render.resolution_y = 1080
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/render/DVCPRO_HD_720p.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 960
 bpy.context.scene.render.resolution_y = 720
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/render/HDTV_1080p.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 1920
 bpy.context.scene.render.resolution_y = 1080
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/render/HDTV_720p.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 1280
 bpy.context.scene.render.resolution_y = 720
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/render/HDV_1080p.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 1440
 bpy.context.scene.render.resolution_y = 1080
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/render/TV_NTSC_16_colon_9.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 720
 bpy.context.scene.render.resolution_y = 480
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/render/TV_NTSC_4_colon_3.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 720
 bpy.context.scene.render.resolution_y = 486
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/render/TV_PAL_16_colon_9.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 720
 bpy.context.scene.render.resolution_y = 576
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/render/TV_PAL_4_colon_3.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.scene.render.resolution_x = 720
 bpy.context.scene.render.resolution_y = 576
 bpy.context.scene.render.resolution_percentage = 100

release/scripts/presets/sss/apple.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 11.605, 3.884, 1.754
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.430, 0.210, 0.168

release/scripts/presets/sss/chicken.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 9.436, 3.348, 1.790
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.439, 0.216, 0.141

release/scripts/presets/sss/cream.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 15.028, 4.664, 2.541
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.987, 0.943, 0.827

release/scripts/presets/sss/ketchup.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 4.762, 0.575, 0.394
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.222, 0.008, 0.002

release/scripts/presets/sss/marble.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 8.509, 5.566, 3.951
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.925, 0.905, 0.884

release/scripts/presets/sss/potato.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 14.266, 7.228, 2.036
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.855, 0.740, 0.292

release/scripts/presets/sss/skim_milk.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 18.424, 10.443, 3.502
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.889, 0.888, 0.796

release/scripts/presets/sss/skin1.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 3.673, 1.367, 0.683
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.574, 0.313, 0.174

release/scripts/presets/sss/skin2.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 4.821, 1.694, 1.090
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.749, 0.571, 0.467

release/scripts/presets/sss/whole_milk.py

@@ -1,2 +1,3 @@
+import bpy
 bpy.context.active_object.active_material.subsurface_scattering.radius = 10.899, 6.575, 2.508
 bpy.context.active_object.active_material.subsurface_scattering.color = 0.947, 0.931, 0.852

release/scripts/presets/sunsky/classic.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.object.data.sky.atmosphere_turbidity = 4.0
 bpy.context.object.data.sky.sky_blend_type = 'ADD'
 bpy.context.object.data.sky.sky_blend = 1.0

release/scripts/presets/sunsky/desert.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.object.data.sky.atmosphere_turbidity = 6.0
 bpy.context.object.data.sky.sky_blend_type = 'ADD'
 bpy.context.object.data.sky.sky_blend = 1.0

release/scripts/presets/sunsky/mountain.py

@@ -1,3 +1,4 @@
+import bpy
 bpy.context.object.data.sky.atmosphere_turbidity = 2.00000023842
 bpy.context.object.data.sky.sky_blend_type = 'ADD'
 bpy.context.object.data.sky.sky_blend = 1.0

release/scripts/templates/operator.py

@@ -1,4 +1,3 @@
-
 import bpy
 
 def write_some_data(context, filepath, use_some_setting):

release/scripts/templates/operator_modal.py

@@ -1,3 +1,4 @@
+import bpy
 from bpy.props import *
 
 class ModalOperator(bpy.types.Operator):

release/scripts/templates/operator_modal_draw.py

@@ -1,3 +1,4 @@
+import bpy
 import bgl
 import blf
 

release/scripts/templates/operator_modal_view3d.py

@@ -1,3 +1,4 @@
+import bpy
 from mathutils import Vector
 from bpy.props import FloatVectorProperty
 

release/scripts/templates/operator_uv.py

@@ -1,3 +1,4 @@
+import bpy
 
 def main(context):
     obj = context.active_object

release/scripts/ui/space_sequencer.py

@@ -69,6 +69,14 @@ class SEQUENCER_HT_header(bpy.types.Header):
         else:
             layout.prop(st, "display_channel", text="Channel")
 
+            ed = context.scene.sequence_editor
+            if ed:
+                row = layout.row(align=True)
+                row.prop(ed, "show_overlay", text="", icon='GHOST_ENABLED')
+                if ed.show_overlay:
+                    row.prop(ed, "overlay_frame", text="")
+                    row.prop(ed, "overlay_lock", text="", icon='LOCKED')
+
 
 class SEQUENCER_MT_view_toggle(bpy.types.Menu):
     bl_label = "View Type"
@@ -126,6 +134,10 @@ class SEQUENCER_MT_view(bpy.types.Menu):
             layout.operator_context = 'INVOKE_REGION_PREVIEW'
             layout.operator("sequencer.view_all_preview", text='Fit preview in window')
             layout.operator_context = 'INVOKE_DEFAULT'
+
+            # # XXX, invokes in the header view
+            # layout.operator("sequencer.view_ghost_border", text='Overlay Border')
+
         layout.operator("sequencer.view_selected")
 
         layout.prop(st, "draw_frames")

release/scripts/ui/space_userpref.py

@@ -854,7 +854,7 @@ class USERPREF_PT_addons(bpy.types.Panel):
 
         cats = ["All", "Enabled", "Disabled"] + sorted(cats)
 
-        bpy.types.Scene.EnumProperty(items=[(cat, cat, str(i)) for i, cat in enumerate(cats)],
+        bpy.types.Scene.EnumProperty(items=[(cat, cat, cat + " addons") for cat in cats],
             name="Category", attr="addon_filter", description="Filter add-ons by category")
         bpy.types.Scene.StringProperty(name="Search", attr="addon_search",
             description="Search within the selected filter")