[Bf-blender-cvs] [4597589503f] blender2.8: Cleanup: replace pointer/int casts with macros

Campbell Barton noreply at git.blender.org
Wed Sep 19 04:11:26 CEST 2018


Commit: 4597589503ff7e5416e1545716f952f951f77353
Author: Campbell Barton
Date:   Wed Sep 19 12:22:23 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB4597589503ff7e5416e1545716f952f951f77353

Cleanup: replace pointer/int casts with macros

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

M	source/blender/editors/mesh/editmesh_select_similar.c

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

diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c
index 415386a5770..33b704fce73 100644
--- a/source/blender/editors/mesh/editmesh_select_similar.c
+++ b/source/blender/editors/mesh/editmesh_select_similar.c
@@ -286,10 +286,10 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
 			if (BM_elem_flag_test(vert, BM_ELEM_SELECT)) {
 				switch (type) {
 					case SIMVERT_FACE:
-						BLI_gset_add(gset, (void *)(long)BM_vert_face_count(vert));
+						BLI_gset_add(gset, POINTER_FROM_INT(BM_vert_face_count(vert)));
 						break;
 					case SIMVERT_EDGE:
-						BLI_gset_add(gset, (void *)(long)BM_vert_edge_count(vert));
+						BLI_gset_add(gset, POINTER_FROM_INT(BM_vert_edge_count(vert)));
 						break;
 					case SIMVERT_NORMAL:
 					{
@@ -329,8 +329,8 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
 						const int num_edges = BM_vert_edge_count(vert);
 						GSetIterator gs_iter;
 						GSET_ITER(gs_iter, gset) {
-							const int num_edges_iter = (long)BLI_gsetIterator_getKey(&gs_iter);
-							long delta_i = num_edges - num_edges_iter;
+							const int num_edges_iter = POINTER_AS_INT(BLI_gsetIterator_getKey(&gs_iter));
+							const int delta_i = num_edges - num_edges_iter;
 							if (bm_sel_similar_cmp_i(delta_i, compare)) {
 								BM_vert_select_set(bm, vert, true);
 								changed = true;
@@ -344,8 +344,8 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
 						const int num_faces = BM_vert_face_count(vert);
 						GSetIterator gs_iter;
 						GSET_ITER(gs_iter, gset) {
-							const int num_faces_iter = (long)BLI_gsetIterator_getKey(&gs_iter);
-							int delta_i = num_faces - num_faces_iter;
+							const int num_faces_iter = POINTER_AS_INT(BLI_gsetIterator_getKey(&gs_iter));
+							const int delta_i = num_faces - num_faces_iter;
 							if (bm_sel_similar_cmp_i(delta_i, compare)) {
 								BM_vert_select_set(bm, vert, true);
 								changed = true;



More information about the Bf-blender-cvs mailing list