diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-02-02 15:29:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-02 15:29:53 +0300 |
commit | 81f97692ae8d364dfc23d9bab617502ebf3e90b2 (patch) | |
tree | f08e9fefb289d5c11c2c74aaa2543ec0c26aebc9 /source/blender/editors | |
parent | 7b369080d0e999532f95da42b5806f9081a40e0d (diff) |
cleanup: style/spelling
Diffstat (limited to 'source/blender/editors')
5 files changed, 16 insertions, 12 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index d778b06cf5f..140b7e0b117 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -1057,7 +1057,7 @@ static void select_timeline_marker_frame(ListBase *markers, int frame, bool exte } BLI_LISTBASE_CIRCULAR_FORWARD_BEGIN (markers, marker, marker_first) { - /* this way a not-extend select will allways give 1 selected marker */ + /* this way a not-extend select will always give 1 selected marker */ if (marker->frame == frame) { marker->flag ^= SELECT; break; diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 29b9db2a63c..0b1794e7764 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3250,7 +3250,7 @@ static void brush_puff(PEData *data, int point_index) static void BKE_brush_weight_get(PEData *data, float UNUSED(mat[4][4]), float UNUSED(imat[4][4]), int point_index, int key_index, PTCacheEditKey *UNUSED(key)) { - /* roots have full weight allways */ + /* roots have full weight always */ if (key_index) { PTCacheEdit *edit = data->edit; ParticleSystem *psys = edit->psys; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 6bc597fa175..c601129b7c7 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3367,8 +3367,9 @@ static bool project_paint_clone_face_skip(ProjPaintState *ps, if (ps->do_material_slots) { if (lc->slot_clone != lc->slot_last_clone) { if (!slot->uvname || - !(lc->tf_clone_base = CustomData_get_layer_named(&ps->dm->faceData, CD_MTFACE, - lc->slot_clone->uvname))) + !(lc->tf_clone_base = CustomData_get_layer_named( + &ps->dm->faceData, CD_MTFACE, + lc->slot_clone->uvname))) { lc->tf_clone_base = CustomData_get_layer(&ps->dm->faceData, CD_MTFACE); } @@ -3413,7 +3414,10 @@ static bool project_paint_check_face_sel(const ProjPaintState *ps, if (ps->do_face_sel) { int orig_index; if (face_lookup->index_mp_to_orig && - ((orig_index = DM_origindex_mface_mpoly(face_lookup->index_mf_to_mpoly, face_lookup->index_mp_to_orig, face_index))) != ORIGINDEX_NONE) + ((orig_index = DM_origindex_mface_mpoly( + face_lookup->index_mf_to_mpoly, + face_lookup->index_mp_to_orig, + face_index))) != ORIGINDEX_NONE) { MPoly *mp = &face_lookup->mpoly_orig[orig_index]; return ((mp->flag & ME_FACE_SEL) != 0); @@ -3498,9 +3502,10 @@ static bool project_paint_backface_cull(const ProjPaintState *ps, const MFace *m * sure all the verts are pointing away from the view, * not just the face */ if ((ps->vertFlags[mf->v1] & PROJ_VERT_CULL) && - (ps->vertFlags[mf->v2] & PROJ_VERT_CULL) && - (ps->vertFlags[mf->v3] & PROJ_VERT_CULL) && - (mf->v4 == 0 || ps->vertFlags[mf->v4] & PROJ_VERT_CULL)) { + (ps->vertFlags[mf->v2] & PROJ_VERT_CULL) && + (ps->vertFlags[mf->v3] & PROJ_VERT_CULL) && + (mf->v4 == 0 || ps->vertFlags[mf->v4] & PROJ_VERT_CULL)) + { return true; } } diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 5821ec86ba3..d9d0d8f5ef6 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -165,7 +165,7 @@ static void paint_draw_line_cursor(bContext *C, int x, int y, void *customdata) glColor4ub(0, 0, 0, paint->paint_cursor_col[3]); glLineWidth(3.0); - if (stroke->constrain_line){ + if (stroke->constrain_line) { sdrawline((int)stroke->last_mouse_position[0], (int)stroke->last_mouse_position[1], stroke->constrained_pos[0], stroke->constrained_pos[1]); } @@ -176,7 +176,7 @@ static void paint_draw_line_cursor(bContext *C, int x, int y, void *customdata) glColor4ub(255, 255, 255, paint->paint_cursor_col[3]); glLineWidth(1.0); - if (stroke->constrain_line){ + if (stroke->constrain_line) { sdrawline((int)stroke->last_mouse_position[0], (int)stroke->last_mouse_position[1], stroke->constrained_pos[0], stroke->constrained_pos[1]); } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 489265a83f4..fcb35bc86f2 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -3426,8 +3426,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op) bool override = RNA_boolean_get(op->ptr, "override"); bool turnon = true; - if (ed == NULL || - !(proxy_25 || proxy_50 || proxy_75 || proxy_100)) { + if (ed == NULL || !(proxy_25 || proxy_50 || proxy_75 || proxy_100)) { turnon = false; } |