[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45260] trunk/blender/source/blender: fix [#30715] bmesh: select linked not ignoring hidden verts/edges/faces
Campbell Barton
ideasman42 at gmail.com
Thu Mar 29 15:09:18 CEST 2012
Revision: 45260
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45260
Author: campbellbarton
Date: 2012-03-29 13:09:07 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
fix [#30715] bmesh: select linked not ignoring hidden verts/edges/faces
add optional flag to ignore hidden elements.
also remove loop mask flag - since it wasnt used and vert/edge/face is enough.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_deform.h
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers.h
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
Modified: trunk/blender/source/blender/blenkernel/BKE_deform.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_deform.h 2012-03-29 12:15:48 UTC (rev 45259)
+++ trunk/blender/source/blender/blenkernel/BKE_deform.h 2012-03-29 13:09:07 UTC (rev 45260)
@@ -53,6 +53,7 @@
struct MDeformWeight *defvert_verify_index(struct MDeformVert *dv, const int defgroup);
void defvert_add_index_notest(struct MDeformVert *dv, int defgroup, const float weight);
void defvert_remove_group(struct MDeformVert *dvert, struct MDeformWeight *dw);
+void defvert_clear(struct MDeformVert *dvert);
float defvert_find_weight(const struct MDeformVert *dvert, const int defgroup);
float defvert_array_find_weight_safe(const struct MDeformVert *dvert, const int index, const int defgroup);
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2012-03-29 12:15:48 UTC (rev 45259)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2012-03-29 13:09:07 UTC (rev 45260)
@@ -690,3 +690,13 @@
}
}
}
+
+void defvert_clear(MDeformVert *dvert)
+{
+ if (dvert->dw) {
+ MEM_freeN(dvert->dw);
+ dvert->dw = NULL;
+ }
+
+ dvert->totweight = 0;
+}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c 2012-03-29 12:15:48 UTC (rev 45259)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c 2012-03-29 13:09:07 UTC (rev 45260)
@@ -73,17 +73,18 @@
* by the bitmask 'searchmask'.
*/
void BMW_init(BMWalker *walker, BMesh *bm, int type,
- short mask_vert, short mask_edge, short mask_loop, short mask_face,
+ short mask_vert, short mask_edge, short mask_face,
+ BMWFlag flag,
int layer)
{
memset(walker, 0, sizeof(BMWalker));
walker->layer = layer;
+ walker->flag = flag;
walker->bm = bm;
walker->mask_vert = mask_vert;
walker->mask_edge = mask_edge;
- walker->mask_loop = mask_loop;
walker->mask_face = mask_face;
walker->visithash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "bmesh walkers 1");
@@ -92,8 +93,8 @@
if (UNLIKELY(type >= BMW_MAXWALKERS || type < 0)) {
fprintf(stderr,
"Invalid walker type in BMW_init; type: %d, "
- "searchmask: (v:%d, e:%d, l:%d, f:%d), flag: %d\n",
- type, mask_vert, mask_edge, mask_loop, mask_face, layer);
+ "searchmask: (v:%d, e:%d, f:%d), flag: %d, layer: %d\n",
+ type, mask_vert, mask_edge, mask_face, flag, layer);
BMESH_ASSERT(0);
}
@@ -110,7 +111,6 @@
* 'bm_walker_types' needs updating */
BLI_assert(mask_vert == 0 || (walker->valid_mask & BM_VERT));
BLI_assert(mask_edge == 0 || (walker->valid_mask & BM_EDGE));
- BLI_assert(mask_loop == 0 || (walker->valid_mask & BM_LOOP));
BLI_assert(mask_face == 0 || (walker->valid_mask & BM_FACE));
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers.h 2012-03-29 12:15:48 UTC (rev 45259)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers.h 2012-03-29 13:09:07 UTC (rev 45260)
@@ -38,6 +38,11 @@
BMW_BREADTH_FIRST
} BMWOrder;
+typedef enum {
+ BMW_FLAG_NOP = 0,
+ BMW_FLAG_TEST_HIDDEN = (1 << 0)
+} BMWFlag;
+
/*Walkers*/
typedef struct BMWalker {
void (*begin) (struct BMWalker *walker, void *start);
@@ -54,12 +59,14 @@
BLI_mempool *worklist;
ListBase states;
- /* these masks are to be tested against elements BMO_elem_flag_test() */
+ /* these masks are to be tested against elements BMO_elem_flag_test(),
+ * should never be accessed directly only through BMW_init() and bmw_mask_check_*() functions */
short mask_vert;
short mask_edge;
- short mask_loop;
short mask_face;
+ BMWFlag flag;
+
GHash *visithash;
GHash *secvisithash;
int depth;
@@ -71,7 +78,8 @@
/* initialize a walker. searchmask restricts some (not all) walkers to
* elements with a specific tool flag set. flags is specific to each walker.*/
void BMW_init(struct BMWalker *walker, BMesh *bm, int type,
- short mask_vert, short mask_edge, short mask_loop, short mask_face,
+ short mask_vert, short mask_edge, short mask_face,
+ BMWFlag flag,
int layer);
void *BMW_begin(BMWalker *walker, void *start);
void *BMW_step(struct BMWalker *walker);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-29 12:15:48 UTC (rev 45259)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-29 13:09:07 UTC (rev 45260)
@@ -34,6 +34,45 @@
#include "intern/bmesh_private.h"
#include "intern/bmesh_walkers_private.h"
+static int bmw_mask_check_vert(BMWalker *walker, BMVert *v)
+{
+ if ((walker->flag & BMW_FLAG_TEST_HIDDEN) && BM_elem_flag_test(v, BM_ELEM_HIDDEN)) {
+ return FALSE;
+ }
+ else if (walker->mask_vert && !BMO_elem_flag_test(walker->bm, v, walker->mask_vert)) {
+ return FALSE;
+ }
+ else {
+ return TRUE;
+ }
+}
+
+static int bmw_mask_check_edge(BMWalker *walker, BMEdge *e)
+{
+ if ((walker->flag & BMW_FLAG_TEST_HIDDEN) && BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
+ return FALSE;
+ }
+ else if (walker->mask_edge && !BMO_elem_flag_test(walker->bm, e, walker->mask_edge)) {
+ return FALSE;
+ }
+ else {
+ return TRUE;
+ }
+}
+
+static int bmw_mask_check_face(BMWalker *walker, BMFace *f)
+{
+ if ((walker->flag & BMW_FLAG_TEST_HIDDEN) && BM_elem_flag_test(f, BM_ELEM_HIDDEN)) {
+ return FALSE;
+ }
+ else if (walker->mask_face && !BMO_elem_flag_test(walker->bm, f, walker->mask_face)) {
+ return FALSE;
+ }
+ else {
+ return TRUE;
+ }
+}
+
/**
* Shell Walker:
*
@@ -50,7 +89,7 @@
return;
}
- if (walker->mask_edge && !BMO_elem_flag_test(walker->bm, e, walker->mask_edge)) {
+ if (!bmw_mask_check_edge(walker, e)) {
return;
}
@@ -176,7 +215,8 @@
/* already visited */
return;
}
- if (walker->mask_vert && !BMO_elem_flag_test(walker->bm, v, walker->mask_vert)) {
+
+ if (!bmw_mask_check_vert(walker, v)) {
/* not flagged for walk */
return;
}
@@ -279,7 +319,8 @@
l = l->radial_next;
f = l->f;
e = l->e;
- if (walker->mask_face && !BMO_elem_flag_test(walker->bm, f, walker->mask_face)) {
+
+ if (!bmw_mask_check_face(walker, f)) {
l = l->radial_next;
break;
}
@@ -322,7 +363,7 @@
{
BMwIslandWalker *iwalk = NULL;
- if (walker->mask_face && !BMO_elem_flag_test(walker->bm, (BMElemF *)data, walker->mask_face)) {
+ if (!bmw_mask_check_face(walker, data)) {
return;
}
@@ -352,13 +393,14 @@
l = BM_iter_new(&liter, walker->bm, BM_LOOPS_OF_FACE, iwalk->cur);
for ( ; l; l = BM_iter_step(&liter)) {
/* could skip loop here too, but don't add unless we need it */
- if (walker->mask_edge && !BMO_elem_flag_test(walker->bm, l->e, walker->mask_edge)) {
+ if (!bmw_mask_check_edge(walker, l->e)) {
continue;
}
f = BM_iter_new(&iter, walker->bm, BM_FACES_OF_EDGE, l->e);
for ( ; f; f = BM_iter_step(&iter)) {
- if (walker->mask_face && !BMO_elem_flag_test(walker->bm, f, walker->mask_face)) {
+
+ if (!bmw_mask_check_face(walker, f)) {
continue;
}
@@ -884,9 +926,10 @@
type = walker->bm->ldata.layers[walker->layer].type;
BMW_state_remove(walker);
-
- if (walker->mask_edge && !BMO_elem_flag_test(walker->bm, l->e, walker->mask_edge))
+
+ if (!bmw_mask_check_edge(walker, l->e)) {
return l;
+ }
/* go over loops around l->v and nl->v and see which ones share l and nl's
* mloopuv's coordinates. in addition, push on l->next if necessary */
@@ -898,13 +941,16 @@
rlen = BM_edge_face_count(l2->e);
for (j = 0; j < rlen; j++) {
- if (BLI_ghash_haskey(walker->visithash, l2))
+ if (BLI_ghash_haskey(walker->visithash, l2)) {
continue;
- if (walker->mask_edge && !(BMO_elem_flag_test(walker->bm, l2->e, walker->mask_edge))) {
- if (l2->v != cl->v)
+ }
+
+ if (!bmw_mask_check_edge(walker, l2->e)) {
+ if (l2->v != cl->v) {
continue;
+ }
}
-
+
l3 = l2->v != cl->v ? l2->next : l2;
d2 = CustomData_bmesh_get_layer_n(&walker->bm->ldata,
l3->head.data, walker->layer);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-03-29 12:15:48 UTC (rev 45259)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-03-29 13:09:07 UTC (rev 45260)
@@ -47,8 +47,10 @@
/* checks if there are any unmarked boundary edges in the face regio */
BMW_init(®walker, bm, BMW_ISLAND,
- BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK,
+ BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK,
+ BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */
BMW_NIL_LAY);
+
f2 = BMW_begin(®walker, f);
for ( ; f2; f2 = BMW_step(®walker)) {
l2 = BM_iter_new(&liter2, bm, BM_LOOPS_OF_FACE, f2);
@@ -106,7 +108,8 @@
/* yay, walk */
BMW_init(®walker, bm, BMW_ISLAND,
- BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK,
+ BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK,
+ BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */
BMW_NIL_LAY);
f2 = BMW_begin(®walker, f);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c 2012-03-29 12:15:48 UTC (rev 45259)
+++ trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c 2012-03-29 13:09:07 UTC (rev 45260)
@@ -376,7 +376,8 @@
BMO_slot_buffer_flag_enable(bm, op, "edges", BM_EDGE, EDGE_MARK);
BMW_init(&walker, bm, BMW_SHELL,
- BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP, BMW_MASK_NOP,
+ BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP,
+ BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */
BMW_NIL_LAY);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list