svn merge ^/trunk/blender -r49037:49061

2012-07-19 10:29:39 +00:00
parent bccc6b12b5 9c8edae7d4
commit 371e259a0b
47 changed files with 463 additions and 512 deletions
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -36,6 +36,10 @@ class MESH_OT_delete_edgeloop(Operator):
    bl_idname = "mesh.delete_edgeloop"
    bl_label = "Delete Edge Loop"

+    @classmethod
+    def poll(cls, context):
+        return bpy.ops.transform.edge_slide.poll()
+
    def execute(self, context):
        if 'FINISHED' in bpy.ops.transform.edge_slide(value=1.0):
            bpy.ops.mesh.select_more()