diff options
author | Mike Erwin <significant.bit@gmail.com> | 2016-01-28 08:30:50 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2016-01-28 08:30:50 +0300 |
commit | a1d7f67d81bdc7ece8a757ab79d0b64f4e612bfd (patch) | |
tree | 2b75c319b1db74507714bd8b778a29929ce76ac8 /source/blender/editors | |
parent | ba9468768ddcfd1e028893a1bc4f255bae7eac5a (diff) |
cleanup: spelling / typos
no functional changes
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_align.c | 10 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 28 |
2 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/editors/interface/interface_align.c b/source/blender/editors/interface/interface_align.c index e9d601457b4..500744c366d 100644 --- a/source/blender/editors/interface/interface_align.c +++ b/source/blender/editors/interface/interface_align.c @@ -102,7 +102,7 @@ enum { /* 0: LEFT/RIGHT sides; 1 = TOP/DOWN sides. */ #define IS_COLUMN(_s) ((_s) % 2) -/* Stich flag from side value. */ +/* Stitch flag from side value. */ #define STITCH(_s) (1 << (_s)) /* Max distance between to buttons for them to be 'mergeable'. */ @@ -151,8 +151,8 @@ static void block_align_proximity_compute(ButAlign *butal, ButAlign *butal_other side_opp = OPPOSITE(side); /* We check both opposite sides at once, because with very small buttons, delta could be below max_delta for - * the wrong side (that is, in horizontal case, the total width of two buttons can be below max_delta). */ - /* We rely on exact zero value here as an 'already processed' flag, so ensure we never actually + * the wrong side (that is, in horizontal case, the total width of two buttons can be below max_delta). + * We rely on exact zero value here as an 'already processed' flag, so ensure we never actually * set a zero value at this stage. FLT_MIN is zero-enough for UI position computing. ;) */ delta = max_ff(fabsf(*butal->borders[side] - *butal_other->borders[side_opp]), FLT_MIN); delta_side_opp = max_ff(fabsf(*butal->borders[side_opp] - *butal_other->borders[side]), FLT_MIN); @@ -399,7 +399,7 @@ void ui_block_align_calc(uiBlock *block) } } - /* Forth loop: we have all our 'aligned' buttons as a 'map' in butal_array. We need to: + /* Fourth loop: we have all our 'aligned' buttons as a 'map' in butal_array. We need to: * - update their relevant coordinates to stitch them. * - assign them valid flags. */ @@ -568,7 +568,7 @@ static void ui_block_align_calc_but(uiBut *first, short nr) flag |= UI_BUT_ALIGN_TOP; } - if ((flag & UI_BUT_ALIGN_TOP) == 0) { /* stil top row */ + if ((flag & UI_BUT_ALIGN_TOP) == 0) { /* still top row */ if (prev) { if (next && buts_are_horiz(but, next)) flag = UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_RIGHT; diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 65cb8a93095..f9d046be86e 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -87,7 +87,7 @@ typedef struct StitchPreviewer { unsigned int num_stitchable; unsigned int num_unstitchable; unsigned int preview_uvs; - /* ...and here we'll store the static island triangles*/ + /* ...and here we'll store the static island triangles */ float *static_tris; unsigned int num_static_tris; } StitchPreviewer; @@ -95,7 +95,7 @@ typedef struct StitchPreviewer { struct IslandStitchData; -/* This is a straightforward implementation, count the uv's in the island that will move and take the mean displacement/rotation and apply it to all +/* This is a straightforward implementation, count the UVs in the island that will move and take the mean displacement/rotation and apply it to all * elements of the island except from the stitchable */ typedef struct IslandStitchData { /* rotation can be used only for edges, for vertices there is no such notion */ @@ -145,7 +145,7 @@ typedef struct StitchState { float limit_dist; /* snap uv islands together during stitching */ bool snap_islands; - /* stich at midpoints or at islands */ + /* stitch at midpoints or at islands */ bool midpoints; /* editmesh, cached for use in modal handler */ BMEditMesh *em; @@ -781,8 +781,8 @@ static void stitch_setup_face_preview_for_uv_group(UvElement *element, StitchSta /* checks if uvs are indeed stitchable and registers so that they can be shown in preview */ -static void stitch_validate_uv_stichability(UvElement *element, StitchState *state, IslandStitchData *island_stitch_data, - PreviewPosition *preview_position) +static void stitch_validate_uv_stitchability(UvElement *element, StitchState *state, IslandStitchData *island_stitch_data, + PreviewPosition *preview_position) { UvElement *element_iter; StitchPreviewer *preview = state->stitch_preview; @@ -817,8 +817,8 @@ static void stitch_validate_uv_stichability(UvElement *element, StitchState *sta } -static void stitch_validate_edge_stichability(UvEdge *edge, StitchState *state, IslandStitchData *island_stitch_data, - PreviewPosition *preview_position) +static void stitch_validate_edge_stitchability(UvEdge *edge, StitchState *state, IslandStitchData *island_stitch_data, + PreviewPosition *preview_position) { UvEdge *edge_iter = edge->first; StitchPreviewer *preview = state->stitch_preview; @@ -957,7 +957,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) UvElement *element = (UvElement *)state->selection_stack[i]; if (element->flag & STITCH_STITCHABLE_CANDIDATE) { element->flag &= ~STITCH_STITCHABLE_CANDIDATE; - stitch_validate_uv_stichability(element, state, island_stitch_data, preview_position); + stitch_validate_uv_stitchability(element, state, island_stitch_data, preview_position); } else { /* add to preview for unstitchable */ @@ -968,7 +968,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) UvEdge *edge = (UvEdge *)state->selection_stack[i]; if (edge->flag & STITCH_STITCHABLE_CANDIDATE) { edge->flag &= ~STITCH_STITCHABLE_CANDIDATE; - stitch_validate_edge_stichability(edge, state, island_stitch_data, preview_position); + stitch_validate_edge_stitchability(edge, state, island_stitch_data, preview_position); } else { preview->num_unstitchable++; @@ -1006,8 +1006,8 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) /* initialize the preview buffers */ preview->preview_polys = (float *)MEM_mallocN(preview->preview_uvs * sizeof(float) * 2, "tri_uv_stitch_prev"); preview->uvs_per_polygon = MEM_mallocN(preview->num_polys * sizeof(*preview->uvs_per_polygon), "tri_uv_stitch_prev"); - preview->preview_stitchable = (float *)MEM_mallocN(preview->num_stitchable * sizeof(float) * preview_size, "stitch_preview_stichable_data"); - preview->preview_unstitchable = (float *)MEM_mallocN(preview->num_unstitchable * sizeof(float) * preview_size, "stitch_preview_unstichable_data"); + preview->preview_stitchable = (float *)MEM_mallocN(preview->num_stitchable * sizeof(float) * preview_size, "stitch_preview_stitchable_data"); + preview->preview_unstitchable = (float *)MEM_mallocN(preview->num_unstitchable * sizeof(float) * preview_size, "stitch_preview_unstitchable_data"); preview->static_tris = (float *)MEM_mallocN(state->tris_per_island[state->static_island] * sizeof(float) * 6, "static_island_preview_tris"); @@ -1019,7 +1019,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) /* copy data from MLoopUVs to the preview display buffers */ BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { - /* just to test if face was added for processing. uvs of inselected vertices will return NULL */ + /* just to test if face was added for processing. uvs of unselected vertices will return NULL */ UvElement *element = BM_uv_element_get(state->element_map, efa, BM_FACE_FIRST_LOOP(efa)); if (element) { @@ -2120,7 +2120,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_PASS_THROUGH; } - /* Use Limit (Default off)*/ + /* Use Limit (Default off) */ case LKEY: if (event->val == KM_PRESS) { state->use_limit = !state->use_limit; @@ -2155,7 +2155,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) } break; - /* Select geometry*/ + /* Select geometry */ case RIGHTMOUSE: if (!event->shift) { stitch_cancel(C, op); |