[Bf-blender-cvs] [c576c77] master: Cleanup: Editmode 3DView Transform panel code: do not check for hidden BMesh verts/edges.

Bastien Montagne noreply at git.blender.org
Wed Oct 15 08:59:26 CEST 2014


Commit: c576c77514901dc11a791f95fc622e16e1cb554d
Author: Bastien Montagne
Date:   Tue Oct 14 22:40:15 2014 +0200
Branches: master
https://developer.blender.org/rBc576c77514901dc11a791f95fc622e16e1cb554d

Cleanup: Editmode 3DView Transform panel code: do not check for hidden BMesh verts/edges.

Afaik, a hidden BMesh element should never be selected. And this check was done in an
awfully inconsistent way! If it should really be needed, should be added back as a macro
used everywhere!

===================================================================

M	source/blender/editors/space_view3d/view3d_buttons.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 847b666..91b60a0 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -529,7 +529,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 				}
 				else if (sca > 0.0f) {
 					BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
-						if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && !BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+						if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 							float *bweight = BM_ELEM_CD_GET_VOID_P(eve, cd_vert_bweight_offset);
 							*bweight *= sca;
 							CLAMP(*bweight, 0.0f, 1.0f);
@@ -538,7 +538,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 				}
 				else {
 					BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
-						if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && !BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+						if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 							float *bweight = BM_ELEM_CD_GET_VOID_P(eve, cd_vert_bweight_offset);
 							*bweight = 1.0f + ((1.0f - *bweight) * sca);
 							CLAMP(*bweight, 0.0f, 1.0f);
@@ -618,7 +618,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 				}
 				else if (sca > 0.0f) {
 					BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
-						if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+						if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 							float *bweight = BM_ELEM_CD_GET_VOID_P(eed, cd_edge_bweight_offset);
 							*bweight *= sca;
 							CLAMP(*bweight, 0.0f, 1.0f);
@@ -627,7 +627,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 				}
 				else {
 					BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
-						if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+						if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 							float *bweight = BM_ELEM_CD_GET_VOID_P(eed, cd_edge_bweight_offset);
 							*bweight = 1.0f + ((1.0f - *bweight) * sca);
 							CLAMP(*bweight, 0.0f, 1.0f);
@@ -651,7 +651,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 				}
 				else if (sca > 0.0f) {
 					BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
-						if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+						if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 							float *crease = BM_ELEM_CD_GET_VOID_P(eed, cd_edge_crease_offset);
 							*crease *= sca;
 							CLAMP(*crease, 0.0f, 1.0f);
@@ -660,7 +660,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 				}
 				else {
 					BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
-						if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+						if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 							float *crease = BM_ELEM_CD_GET_VOID_P(eed, cd_edge_crease_offset);
 							*crease = 1.0f + ((1.0f - *crease) * sca);
 							CLAMP(*crease, 0.0f, 1.0f);




More information about the Bf-blender-cvs mailing list