[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50125] trunk/blender/source/blender/bmesh /operators/bmo_utils.c: Fix #32301: mesh select more/ less not taking hidden vertices/faces into account.

[Brecht Van Lommel]

Revision: 50125
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50125
Author:   blendix
Date:     2012-08-22 15:10:07 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Fix #32301: mesh select more/less not taking hidden vertices/faces into account.

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

Modified: trunk/blender/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_utils.c    2012-08-22 
15:08:41 UTC (rev 50124)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c    2012-08-22 
15:10:07 UTC (rev 50125)
@@ -182,14 +182,17 @@
        if (!usefaces) {
                BMO_ITER (v, &siter, bm, op, "geom", BM_VERT) {
                        BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) {
-                               if (!BMO_elem_flag_test(bm, e, SEL_ORIG))
-                                       break;
+                               if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+                                       if (!BMO_elem_flag_test(bm, e, 
SEL_ORIG))
+                                               break;
                        }
 
                        if (e) {
                                BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) {
-                                       BMO_elem_flag_enable(bm, e, SEL_FLAG);
-                                       BMO_elem_flag_enable(bm, 
BM_edge_other_vert(e, v), SEL_FLAG);
+                                       if (!BM_elem_flag_test(e, 
BM_ELEM_HIDDEN)) {
+                                               BMO_elem_flag_enable(bm, e, 
SEL_FLAG);
+                                               BMO_elem_flag_enable(bm, 
BM_edge_other_vert(e, v), SEL_FLAG);
+                                       }
                                }
                        }
                }
@@ -202,8 +205,10 @@
                BMO_ITER (f, &siter, bm, op, "geom", BM_FACE) {
                        BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
                                BM_ITER_ELEM (f2, &fiter, l->e, 
BM_FACES_OF_EDGE) {
-                                       if (!BMO_elem_flag_test(bm, f2, 
SEL_ORIG)) {
-                                               BMO_elem_flag_enable(bm, f2, 
SEL_FLAG);
+                                       if (!BM_elem_flag_test(f2, 
BM_ELEM_HIDDEN)) {
+                                               if (!BMO_elem_flag_test(bm, f2, 
SEL_ORIG)) {
+                                                       
BMO_elem_flag_enable(bm, f2, SEL_FLAG);
+                                               }
                                        }
                                }
                        }
@@ -221,15 +226,18 @@
        if (!usefaces) {
                BMO_ITER (v, &siter, bm, op, "geom", BM_VERT) {
                        BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) {
-                               if (!BMO_elem_flag_test(bm, e, SEL_ORIG))
-                                       break;
+                               if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+                                       if (!BMO_elem_flag_test(bm, e, 
SEL_ORIG))
+                                               break;
                        }
 
                        if (e) {
                                BMO_elem_flag_enable(bm, v, SEL_FLAG);
 
                                BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) {
-                                       BMO_elem_flag_enable(bm, e, SEL_FLAG);
+                                       if (!BM_elem_flag_test(e, 
BM_ELEM_HIDDEN)) {
+                                               BMO_elem_flag_enable(bm, e, 
SEL_FLAG);
+                                       }
                                }
 
                        }
@@ -243,9 +251,11 @@
                BMO_ITER (f, &siter, bm, op, "geom", BM_FACE) {
                        BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
                                BM_ITER_ELEM (f2, &fiter, l->e, 
BM_FACES_OF_EDGE) {
-                                       if (!BMO_elem_flag_test(bm, f2, 
SEL_ORIG)) {
-                                               BMO_elem_flag_enable(bm, f, 
SEL_FLAG);
-                                               break;
+                                       if (!BM_elem_flag_test(f2, 
BM_ELEM_HIDDEN)) {
+                                               if (!BMO_elem_flag_test(bm, f2, 
SEL_ORIG)) {
+                                                       
BMO_elem_flag_enable(bm, f, SEL_FLAG);
+                                                       break;
+                                               }
                                        }
                                }
                        }

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