[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57661] trunk/blender/source/blender/bmesh /operators/bmo_connect_pair.c: fix for connect_pair cutting across triangle verts from edges.

[Campbell Barton]

Revision: 57661
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57661
Author:   campbellbarton
Date:     2013-06-23 09:50:10 +0000 (Sun, 23 Jun 2013)
Log Message:
-----------
fix for connect_pair cutting across triangle verts from edges.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_connect_pair.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect_pair.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_connect_pair.c     
2013-06-23 00:20:09 UTC (rev 57660)
+++ trunk/blender/source/blender/bmesh/operators/bmo_connect_pair.c     
2013-06-23 09:50:10 UTC (rev 57661)
@@ -170,14 +170,14 @@
                BLI_assert(0);
        }
 
-       if (ele_prev == NULL) {
+       if (ele_from == NULL) {
                printf("from NULL\n");
        }
-       else if (ele_prev->head.htype == BM_EDGE) {
-               printf("from edge %d\n", BM_elem_index_get(ele_prev));
+       else if (ele_from->head.htype == BM_EDGE) {
+               printf("from edge %d\n", BM_elem_index_get(ele_from));
        }
-       else if (ele_prev->head.htype == BM_FACE) {
-               printf("from face %d\n", BM_elem_index_get(ele_prev));
+       else if (ele_from->head.htype == BM_FACE) {
+               printf("from face %d\n", BM_elem_index_get(ele_from));
        }
        else {
                BLI_assert(0);
@@ -286,6 +286,8 @@
                                else {
                                        state = state_step__face_edges(pc, 
state, &state_orig,
                                                                       
l_start->next, l_start);
+                                       state = state_step__face_verts(pc, 
state, &state_orig,
+                                                                      
l_start->next->next, l_start);
                                }
                        }
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs