diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 23:39:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 23:39:14 +0400 |
commit | 63caaa2b12edf0e0a47764156416fac9d43d3664 (patch) | |
tree | 39d9455df141edc2f232240da34514b0468dcc28 /source/blender/bmesh/operators | |
parent | 5928af11ef97d6d9318d3a06fe32f0d77fc48e9c (diff) |
Code Cleanup: rename vars for detecting change to be more consistent
rename change/is_change/is_changed/modified -> changed
also use bools over int/short/char and once accidental float.
Diffstat (limited to 'source/blender/bmesh/operators')
-rw-r--r-- | source/blender/bmesh/operators/bmo_bridge.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_fill_grid.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide_edgering.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c index 10d15d93995..9e9cd0d66e2 100644 --- a/source/blender/bmesh/operators/bmo_bridge.c +++ b/source/blender/bmesh/operators/bmo_bridge.c @@ -484,7 +484,7 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op) const bool use_cyclic = BMO_slot_bool_get(op->slots_in, "use_cyclic") && (use_merge == false); const int twist_offset = BMO_slot_int_get(op->slots_in, "twist_offset"); int count; - bool change = false; + bool changed = false; BMO_slot_buffer_flag_enable(bm, op->slots_in, "edges", BM_EDGE, EDGE_MARK); @@ -546,13 +546,13 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op) if (use_pairs) { el_store = el_store->next; } - change = true; + changed = true; } cleanup: BM_mesh_edgeloops_free(&eloops); - if (change) { + if (changed) { if (use_merge == false) { BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "faces.out", BM_FACE, FACE_OUT); BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "edges.out", BM_EDGE, EDGE_OUT); diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c index 50d25202f7e..6a0fca425f8 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.c +++ b/source/blender/bmesh/operators/bmo_fill_grid.c @@ -594,7 +594,7 @@ void bmo_grid_fill_exec(BMesh *bm, BMOperator *op) const bool use_interp_simple = BMO_slot_bool_get(op->slots_in, "use_interp_simple"); int count; - bool change = false; + bool changed = false; BMO_slot_buffer_flag_enable(bm, op->slots_in, "edges", BM_EDGE, EDGE_MARK); count = BM_mesh_edgeloops_find(bm, &eloops, bm_edge_test_cb, (void *)bm); @@ -690,14 +690,14 @@ void bmo_grid_fill_exec(BMesh *bm, BMOperator *op) bm_grid_fill(bm, estore_a, estore_b, estore_rail_a, estore_rail_b, mat_nr, use_smooth, use_interp_simple); - change = true; + changed = true; cleanup: BM_mesh_edgeloops_free(&eloops); BM_mesh_edgeloops_free(&eloops_rail); - if (change) { + if (changed) { BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "faces.out", BM_FACE, FACE_OUT); } } diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index 13a7aa09335..d1ec06c5486 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -1070,7 +1070,7 @@ void bmo_subdivide_edgering_exec(BMesh *bm, BMOperator *op) BMOIter siter; BMEdge *e; int count; - bool change = false; + bool changed = false; const int cuts = BMO_slot_int_get(op->slots_in, "cuts"); const int interp_mode = BMO_slot_int_get(op->slots_in, "interp_mode"); @@ -1166,7 +1166,7 @@ void bmo_subdivide_edgering_exec(BMesh *bm, BMOperator *op) bm_edgering_pair_ringsubd(bm, lpair, el_store_a, el_store_b, interp_mode, cuts, smooth, falloff_cache); bm_edgering_pair_store_free(lpair, interp_mode); - change = true; + changed = true; } else { BMO_error_raise(bm, op, BMERR_INVALID_SELECTION, @@ -1217,7 +1217,7 @@ void bmo_subdivide_edgering_exec(BMesh *bm, BMOperator *op) bm_edgering_pair_ringsubd(bm, lpair, el_store_a, el_store_b, interp_mode, cuts, smooth, falloff_cache); bm_edgering_pair_store_free(lpair, interp_mode); - change = true; + changed = true; } BLI_assert(bm_verts_tag_count(bm) == 0); @@ -1229,7 +1229,7 @@ cleanup: BM_mesh_edgeloops_free(&eloops_rim); /* flag output */ - if (change) { + if (changed) { BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "faces.out", BM_FACE, FACE_OUT); } } |