Editmesh: extruding end-point verts now maintains edge-direction
authorCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jun 2014 08:38:17 +0000 (18:38 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jun 2014 08:41:07 +0000 (18:41 +1000)
Resolves T40745, where faces from extruded edges had flipped normals.

source/blender/bmesh/intern/bmesh_queries_inline.h
source/blender/bmesh/operators/bmo_extrude.c

index a2a0a15faad23a745779304f947cc05fe4b5d332..0856b9846c126d45123c9cf0a2234172c10440f8 100644 (file)
@@ -137,4 +137,17 @@ BLI_INLINE bool BM_loop_is_adjacent(const BMLoop *l_a, const BMLoop *l_b)
        return (ELEM(l_b, l_a->next, l_a->prev));
 }
 
+/**
+ * Check if we have a single wire edge user.
+ */
+BLI_INLINE bool BM_vert_is_wire_endpoint(const BMVert *v)
+{
+       const BMEdge *e = v->e;
+       if (e && e->l == NULL) {
+               const BMDiskLink *dl = (e->v1 == v) ? &e->v1_disk_link : &e->v2_disk_link;
+               return (dl->next == e);
+       }
+       return false;
+}
+
 #endif /* __BMESH_QUERIES_INLINE_H__ */
index f924d478f1a42771940b00c7c22bef2b9751f968..d1747691c903101a6b4a53f56e40febcca8877af 100644 (file)
@@ -212,13 +212,20 @@ void bmo_extrude_vert_indiv_exec(BMesh *bm, BMOperator *op)
 
        for (v = BMO_iter_new(&siter, op->slots_in, "verts", BM_VERT); v; v = BMO_iter_step(&siter)) {
                dupev = BM_vert_create(bm, v->co, v, BM_CREATE_NOP);
+               BMO_elem_flag_enable(bm, dupev, EXT_KEEP);
+
                if (has_vskin)
                        bm_extrude_disable_skin_root(bm, v);
 
-               e = BM_edge_create(bm, v, dupev, NULL, BM_CREATE_NOP);
+               /* not essentuial, but ensures face normals from extruded edges are contiguous */
+               if (BM_vert_is_wire_endpoint(v)) {
+                       if (v->e->v1 == v) {
+                               SWAP(BMVert *, v, dupev);
+                       }
+               }
 
+               e = BM_edge_create(bm, v, dupev, NULL, BM_CREATE_NOP);
                BMO_elem_flag_enable(bm, e, EXT_KEEP);
-               BMO_elem_flag_enable(bm, dupev, EXT_KEEP);
        }
 
        BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "verts.out", BM_VERT, EXT_KEEP);