Merged changes in the trunk up to revision 52340.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

release/scripts/startup/bl_operators/presets.py

@@ -558,7 +558,7 @@ class WM_MT_operator_presets(Menu):
         # dummy 'default' menu item
         layout = self.layout
         layout.operator("wm.operator_defaults")
-        layout.seperator()
+        layout.separator()
 
         Menu.draw_preset(self, context)
 

release/scripts/startup/bl_operators/screen_play_rendered_anim.py

@@ -116,8 +116,12 @@ class PlayRenderedAnim(Operator):
         cmd = [player_path]
         # extra options, fps controls etc.
         if preset in {'BLENDER24', 'INTERNAL'}:
-            opts = ["-a", "-f", str(rd.fps), str(rd.fps_base),
-                    "-j", str(scene.frame_step), file]
+            opts = ["-a",
+                    "-f", str(rd.fps), str(rd.fps_base),
+                    "-s", str(scene.frame_start),
+                    "-e", str(scene.frame_end),
+                    "-j", str(scene.frame_step),
+                    file]
             cmd.extend(opts)
         elif preset == 'DJV':
             opts = [file, "-playback_speed", "%d" % int(rd.fps / rd.fps_base)]

release/scripts/startup/bl_operators/uvcalc_smart_project.py

@@ -517,7 +517,7 @@ def mergeUvIslands(islandList):
                                     for uv in f.uv:
                                         uv+= offset
 
-                                sourceIsland[0][:] = [] # Empty
+                                del sourceIsland[0][:]  # Empty
 
 
                                 # Move edge loop into new and offset.
@@ -527,7 +527,7 @@ def mergeUvIslands(islandList):
                                      (e[0]+offset, e[1]+offset, e[2])\
                                 ) for e in sourceIsland[6] ] )
 
-                                sourceIsland[6][:] = [] # Empty
+                                del sourceIsland[6][:]  # Empty
 
                                 # Sort by edge length, reverse so biggest are first.
 
@@ -540,7 +540,7 @@ def mergeUvIslands(islandList):
                                 for p in sourceIsland[7]:
                                     p+= offset
 
-                                sourceIsland[7][:] = []
+                                del sourceIsland[7][:]
 
 
                                 # Decrement the efficiency

release/scripts/startup/bl_operators/wm.py

@@ -41,12 +41,17 @@ class MESH_OT_delete_edgeloop(Operator):
         return bpy.ops.transform.edge_slide.poll()
 
     def execute(self, context):
+        mesh = context.object.data
+        use_mirror_x = mesh.use_mirror_x
+        mesh.use_mirror_x = False
         if 'FINISHED' in bpy.ops.transform.edge_slide(value=1.0):
             bpy.ops.mesh.select_more()
             bpy.ops.mesh.remove_doubles()
-            return {'FINISHED'}
-
-        return {'CANCELLED'}
+            ret = {'FINISHED'}
+        else:
+            ret = {'CANCELLED'}
+        mesh.use_mirror_x = use_mirror_x
+        return ret
 
 rna_path_prop = StringProperty(
         name="Context Attributes",