diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-10 01:10:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-10 01:14:22 +0300 |
| commit | eb7b450c0c65388758fcec5764a759d3d347c314 (patch) | |
| tree | 8d8d593008a4449e010c019ca1608b4f1e607fc9 /source/blender/editors/uvedit/uvedit_smart_stitch.c | |
| parent | 1ee93dc670556593ed9913ef97f839e423120613 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_smart_stitch.c')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index a5e18851f12..422c3489e01 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -1033,7 +1033,7 @@ static int stitch_process_data( /* remember stitchable candidates as places the 'I' button */ /* will stop at. */ for (int island_idx = 0; island_idx < state->element_map->totalIslands; island_idx++) { - state->island_is_stitchable[island_idx] = island_stitch_data[island_idx].stitchableCandidate?true:false; + state->island_is_stitchable[island_idx] = island_stitch_data[island_idx].stitchableCandidate ? true : false; } if (is_active_state) { @@ -1810,7 +1810,7 @@ static UvEdge *uv_edge_get(BMLoop *l, StitchState *state) return BLI_ghash_lookup(state->edge_hash, &tmp_edge); } -static StitchState* stitch_init( +static StitchState *stitch_init( bContext *C, wmOperator *op, StitchStateContainer *ssc, Object *obedit) { @@ -2132,7 +2132,7 @@ static bool goto_next_island(StitchStateContainer *ssc) int original_island = ssc->static_island; - do { + do { ssc->static_island++; if (ssc->static_island >= active_state->element_map->totalIslands) { /* go to next object */ @@ -2147,8 +2147,8 @@ static bool goto_next_island(StitchStateContainer *ssc) /* We're at an island to make active */ return true; } - } while (!(active_state == original_active_state - && ssc->static_island == original_island)); + } while (!(active_state == original_active_state && + ssc->static_island == original_island)); return false; } @@ -2201,15 +2201,14 @@ static int stitch_init_all(bContext *C, wmOperator *op) uint objects_len = 0; Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, &objects_len); - if (!objects_len) - { + if (objects_len == 0) { MEM_freeN(objects); state_delete_all(ssc); return 0; } - ssc->objects = MEM_callocN(sizeof(Object*) * objects_len, "Object *ssc->objects"); - ssc->states = MEM_callocN(sizeof(StitchState*) * objects_len, "StitchState"); + ssc->objects = MEM_callocN(sizeof(Object *) * objects_len, "Object *ssc->objects"); + ssc->states = MEM_callocN(sizeof(StitchState *) * objects_len, "StitchState"); ssc->objects_len = 0; for (uint ob_index = 0; ob_index < objects_len; ob_index++) { @@ -2350,7 +2349,7 @@ static int stitch_exec(bContext *C, wmOperator *op) } } -static StitchState* stitch_select( +static StitchState *stitch_select( bContext *C, Scene *scene, const wmEvent *event, StitchStateContainer *ssc) { /* add uv under mouse to processed uv's */ |