[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4533] trunk/py/scripts/addons/mesh_f2. py: Fix #35231: f2 addon not working for converting adjacent faces into a single

[Brecht Van Lommel]

Revision: 4533
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4533
Author:   blendix
Date:     2013-05-16 20:42:21 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Fix #35231: f2 addon not working for converting adjacent faces into a single
ngon. Now just let the make face operator try it instead of trying to decide
when to do this.

Modified Paths:
--------------
    trunk/py/scripts/addons/mesh_f2.py

Modified: trunk/py/scripts/addons/mesh_f2.py
===================================================================
--- trunk/py/scripts/addons/mesh_f2.py	2013-05-16 12:29:16 UTC (rev 4532)
+++ trunk/py/scripts/addons/mesh_f2.py	2013-05-16 20:42:21 UTC (rev 4533)
@@ -249,15 +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(bm.faces) > 0:
-                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)