[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4540] tags/2_67a_release/py/scripts/ addons: svn merge ^/trunk/py/scripts/addons -c4533

[Campbell Barton]

Revision: 4540
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4540
Author:   campbellbarton
Date:     2013-05-18 06:57:59 +0000 (Sat, 18 May 2013)
Log Message:
-----------
svn merge ^/trunk/py/scripts/addons -c4533

Modified Paths:
--------------
    tags/2_67a_release/py/scripts/addons/mesh_f2.py

Property Changed:
----------------
    tags/2_67a_release/py/scripts/addons/


Property changes on: tags/2_67a_release/py/scripts/addons
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/py/scripts/addons:4533

Modified: tags/2_67a_release/py/scripts/addons/mesh_f2.py
===================================================================
--- tags/2_67a_release/py/scripts/addons/mesh_f2.py	2013-05-17 17:45:56 UTC (rev 4539)
+++ tags/2_67a_release/py/scripts/addons/mesh_f2.py	2013-05-18 06:57:59 UTC (rev 4540)
@@ -249,14 +249,11 @@
         bm = bmesh.from_edit_mesh(context.active_object.data)
         sel = [v for v in bm.verts if v.select]
         if len(sel) > 2:
-            if len([True for f in bm.faces if f.select]) == len(bm.faces):
-                # all faces selected, can't create new one
-                return {'CANCELLED'}
             # original 'Make Edge/Face' behaviour
             try:
                 bpy.ops.mesh.edge_face_add('INVOKE_DEFAULT')
             except:
-                pass
+                return {'CANCELLED'}
         elif len(sel) == 1:
             # single vertex selected -> mirror vertex and create new face
             quad_from_vertex(bm, sel[0], context, event)
@@ -301,4 +298,4 @@
 
 
 if __name__ == "__main__":
-    register()
\ No newline at end of file
+    register()