diff options
Diffstat (limited to 'source/blender/editors')
20 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 5005a41ada7..afc9d9884f3 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4384,7 +4384,7 @@ static void ui_but_submenu_enable(uiBlock *block, uiBut *but) * avoid an extra lookup on 'prop' when its already available. * * When this kind of change won't disrupt branches, best look into making more - * of our UI functions take prop rather then propname. + * of our UI functions take prop rather than propname. */ static uiBut *ui_def_but_rna(uiBlock *block, int type, diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 5da3d9528f8..01eb8f95d18 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -531,7 +531,7 @@ struct uiBlock { void *evil_C; /** unit system, used a lot for numeric buttons so include here - * rather then fetching through the scene every time. */ + * rather than fetching through the scene every time. */ struct UnitSettings *unit; /** \note only accessed by color picker templates. */ ColorPickerData color_pickers; diff --git a/source/blender/editors/interface/interface_region_color_picker.c b/source/blender/editors/interface/interface_region_color_picker.c index 61349672f1c..f9a9e7182d2 100644 --- a/source/blender/editors/interface/interface_region_color_picker.c +++ b/source/blender/editors/interface/interface_region_color_picker.c @@ -141,7 +141,7 @@ bool ui_but_is_color_gamma(uiBut *but) void ui_scene_linear_to_color_picker_space(uiBut *but, float rgb[3]) { /* Map to color picking space for HSV values and HSV cube/circle, - * assuming it is more perceptually linear then the scene linear + * assuming it is more perceptually linear than the scene linear * space for intuitive color picking. */ if (!ui_but_is_color_gamma(but)) { IMB_colormanagement_scene_linear_to_color_picking_v3(rgb); diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c index 770a53d8691..62f46c93bc7 100644 --- a/source/blender/editors/mask/mask_add.c +++ b/source/blender/editors/mask/mask_add.c @@ -311,7 +311,7 @@ static bool add_vertex_extrude(const bContext *C, float tangent_point[2]; float tangent_co[2]; bool do_cyclic_correct = false; - bool do_prev; /* use prev point rather then next?? */ + bool do_prev; /* use prev point rather than next?? */ if (!mask_layer) { return false; diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index 8d9837f123a..c4a44aa4a90 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -602,7 +602,7 @@ void MESH_OT_inset(wmOperatorType *ot) prop = RNA_def_float_distance( ot->srna, "thickness", 0.0f, 0.0f, 1e12f, "Thickness", "", 0.0f, 10.0f); - /* use 1 rather then 10 for max else dragging the button moves too far */ + /* use 1 rather than 10 for max else dragging the button moves too far */ RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 4); prop = RNA_def_float_distance( diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 90ef42c6f48..dde422074a7 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1600,7 +1600,7 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd) * can end up being ~2000 units apart with an orthogonal perspective. * * (from ED_view3d_win_to_segment_clipped() above) - * this gives precision error; rather then solving properly + * this gives precision error; rather than solving properly * (which may involve using doubles everywhere!), * limit the distance between these points */ if (kcd->is_ortho && (kcd->vc.rv3d->persp != RV3D_CAMOB)) { diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 62c646a81e4..66d57de70d3 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -130,7 +130,7 @@ static float edbm_rip_edge_side_measure( * from edge midpoint to face center. offset edge midpoint * by a small amount along this vector. */ - /* rather then the face center, get the middle of + /* rather than the face center, get the middle of * both edge verts connected to this one */ v1_other = BM_face_other_vert_loop(e_l->f, e->v2, e->v1)->v; v2_other = BM_face_other_vert_loop(e_l->f, e->v1, e->v2)->v; @@ -146,7 +146,7 @@ static float edbm_rip_edge_side_measure( sub_v2_v2v2(vec, cent, mid); normalize_v2_length(vec, 0.01f); - /* rather then adding to both verts, subtract from the mouse */ + /* rather than adding to both verts, subtract from the mouse */ sub_v2_v2v2(fmval_tweak, fmval, vec); score = len_v2v2(e_v1_co, e_v2_co); @@ -904,7 +904,7 @@ static int edbm_rip_invoke__edge(bContext *C, const wmEvent *event, Object *obed BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) { if (!BM_edge_is_wire(e) && !BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { - /* important to check selection rather then tag here + /* important to check selection rather than tag here * else we get feedback loop */ if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { e_best = e; @@ -1042,7 +1042,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) error_disconnected_vertices = false; /* note on selection: - * When calling edge split we operate on tagged edges rather then selected + * When calling edge split we operate on tagged edges rather than selected * this is important because the edges to operate on are extended by one, * but the selection is left alone. * diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 01e25d5281c..b9eac26eaa8 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -4030,7 +4030,7 @@ static int edbm_knife_cut_exec(bContext *C, wmOperator *op) /* for ED_view3d_project_float_object */ ED_view3d_init_mats_rv3d(obedit, region->regiondata); - /* TODO, investigate using index lookup for screen_vert_coords() rather then a hash table */ + /* TODO, investigate using index lookup for screen_vert_coords() rather than a hash table */ /* the floating point coordinates of verts in screen space will be * stored in a hash table according to the vertices pointer */ @@ -7245,7 +7245,7 @@ void MESH_OT_wireframe(wmOperatorType *ot) RNA_def_boolean(ot->srna, "use_replace", true, "Replace", "Remove original faces"); prop = RNA_def_float_distance( ot->srna, "thickness", 0.01f, 0.0f, 1e4f, "Thickness", "", 0.0f, 10.0f); - /* use 1 rather then 10 for max else dragging the button moves too far */ + /* use 1 rather than 10 for max else dragging the button moves too far */ RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 4); RNA_def_float_distance(ot->srna, "offset", 0.01f, 0.0f, 1e4f, "Offset", "", 0.0f, 10.0f); RNA_def_boolean(ot->srna, diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 0cf9fd7768d..e6d11398279 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3777,7 +3777,7 @@ static void brush_puff(PEData *data, int point_index, float mouse_distance) /* translate (not rotate) the rest of the hair if its not selected */ { /* NOLINTNEXTLINE: readability-redundant-preprocessor */ -# if 0 /* kindof works but looks worse then what's below */ +# if 0 /* kindof works but looks worse than what's below */ /* Move the unselected point on a vector based on the * hair direction and the offset */ diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 75f1e63ebb3..37af1fb6cda 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -467,7 +467,7 @@ typedef struct ProjPixel { /* Only used when the airbrush is disabled. * Store the max mask value to avoid painting over an area with a lower opacity * with an advantage that we can avoid touching the pixel at all, if the - * new mask value is lower then mask_accum */ + * new mask value is lower than mask_accum */ ushort *mask_accum; /* horrible hack, store tile valid flag pointer here to re-validate tiles @@ -2254,7 +2254,7 @@ static bool project_bucket_isect_circle(const float cent[2], /* Would normally to a simple intersection test, * however we know the bounds of these 2 already intersect so we only need to test * if the center is inside the vertical or horizontal bounds on either axis, - * this is even less work then an intersection test. + * this is even less work than an intersection test. */ #if 0 if (BLI_rctf_isect_pt_v(bucket_bounds, cent)) { @@ -2660,7 +2660,7 @@ static void project_bucket_clip_face(const bool is_ortho, * * There are a number of ways this could be done, currently it just collects all * intersecting verts, and line intersections, then sorts them clockwise, this is - * a lot easier then evaluating the geometry to do a correct clipping on both shapes. + * a lot easier than evaluating the geometry to do a correct clipping on both shapes. */ /* Add a bunch of points, we know must make up the convex hull @@ -2765,7 +2765,7 @@ static void project_bucket_clip_face(const bool is_ortho, /* Collect angles for every point around the center point */ -#if 0 /* uses a few more cycles then the above loop */ +#if 0 /* uses a few more cycles than the above loop */ for (int i = 0; i < (*tot); i++) { isectVCosSS[i][2] = angle_2d_clockwise(up, cent, isectVCosSS[i]); } @@ -3248,7 +3248,7 @@ static void project_paint_face_init(const ProjPaintState *ps, vCoSS[1] = ps->screenCoords[lt_vtri[1]]; vCoSS[2] = ps->screenCoords[lt_vtri[2]]; - /* PROJ_FACE_SCALE_SEAM must be slightly less then 1.0f */ + /* PROJ_FACE_SCALE_SEAM must be slightly less than 1.0f */ if (is_ortho) { scale_tri(insetCos, vCoSS, PROJ_FACE_SCALE_SEAM); } @@ -4895,7 +4895,7 @@ static void do_projectpaint_soften_f(ProjPaintState *ps, BlurKernel *kernel = ps->blurkernel; float *rgba = projPixel->newColor.f; - /* rather then painting, accumulate surrounding colors */ + /* rather than painting, accumulate surrounding colors */ zero_v4(rgba); for (yk = 0; yk < kernel->side; yk++) { @@ -4956,7 +4956,7 @@ static void do_projectpaint_soften(ProjPaintState *ps, /* convert to byte after */ float rgba[4]; - /* rather then painting, accumulate surrounding colors */ + /* rather than painting, accumulate surrounding colors */ zero_v4(rgba); for (yk = 0; yk < kernel->side; yk++) { @@ -6285,7 +6285,7 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) array += sizeof(rv3d->viewmat) / sizeof(float); is_ortho = ED_view3d_clip_range_get(depsgraph, v3d, rv3d, &array[0], &array[1], true); /* using float for a bool is dodgy but since its an extra member in the array... - * easier then adding a single bool prop */ + * easier than adding a single bool prop */ array[2] = is_ortho ? 1.0f : 0.0f; IDP_AddToGroup(idgroup, view_data); diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 0da0b191537..75357214936 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -692,7 +692,7 @@ static float paint_space_stroke_spacing(bContext *C, } } else { - /* brushes can have a minimum size of 1.0 but with pressure it can be smaller then a pixel + /* brushes can have a minimum size of 1.0 but with pressure it can be smaller than a pixel * causing very high step sizes, hanging blender T32381. */ size_clamp = max_ff(1.0f, size); } diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index f2d8f50299f..42b2806814b 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -86,7 +86,7 @@ FileSelectParams *ED_fileselect_get_params(struct SpaceFile *sfile) /** * \note RNA_struct_property_is_set_ex is used here because we want - * the previously used settings to be used here rather then overriding them */ + * the previously used settings to be used here rather than overriding them */ short ED_fileselect_set_params(SpaceFile *sfile) { FileSelectParams *params; diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 6f36d3606bc..e36c7d6b6e7 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1570,7 +1570,7 @@ static int image_replace_exec(bContext *C, wmOperator *op) RNA_string_get(op->ptr, "filepath", str); - /* we cant do much if the str is longer then FILE_MAX :/ */ + /* we cant do much if the str is longer than FILE_MAX :/ */ BLI_strncpy(sima->image->filepath, str, sizeof(sima->image->filepath)); if (sima->image->source == IMA_SRC_GENERATED) { diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index 5e0ba506226..a489216afd1 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -58,7 +58,7 @@ typedef struct TextViewDrawState { int scroll_ymin, scroll_ymax; int *xy; // [2] int *sel; // [2] - /* Bottom of view == 0, top of file == combine chars, end of line is lower then start. */ + /* Bottom of view == 0, top of file == combine chars, end of line is lower than start. */ int *mval_pick_offset; const int *mval; // [2] bool do_draw; diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index fca8086d36f..ef7e7874c63 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -231,7 +231,7 @@ static int snode_bg_viewmove_invoke(bContext *C, wmOperator *op, const wmEvent * NodeViewMove *nvm; Image *ima; ImBuf *ibuf; - const float pad = 32.0f; /* better be bigger then scrollbars */ + const float pad = 32.0f; /* better be bigger than scrollbars */ void *lock; diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 1639870fee2..f5707d1ea65 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -34,7 +34,7 @@ #include "sequencer_intern.h" -/* XXX, why is this function better then BLI_math version? +/* XXX, why is this function better than BLI_math version? * only difference is it does some normalize after, need to double check on this - campbell */ static void rgb_to_yuv_normalized(const float rgb[3], float yuv[3]) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c index 990b7952e39..fdba74ed3a6 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c @@ -83,7 +83,7 @@ enum { RULERITEM_USE_ANGLE_ACTIVE = (1 << 1), }; -/* keep smaller then selection, since we may want click elsewhere without selecting a ruler */ +/* keep smaller than selection, since we may want click elsewhere without selecting a ruler */ #define RULER_PICK_DIST 12.0f #define RULER_PICK_DIST_SQ (RULER_PICK_DIST * RULER_PICK_DIST) diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index b05ff207e82..6faaedc1c4a 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1097,7 +1097,7 @@ int view3d_opengl_select(ViewContext *vc, UI_Theme_Store(&theme_state); UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW); - /* Re-use cache (rect must be smaller then the cached) + /* Re-use cache (rect must be smaller than the cached) * other context is assumed to be unchanged */ if (GPU_select_is_cached()) { GPU_select_begin(buffer, bufsize, &rect, gpu_select_mode, 0); diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index f154c8d338e..6c0b03c6206 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -1611,7 +1611,7 @@ void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t) bool has_face_sel = (bm->totfacesel != 0); if (tc->use_mirror_axis_any) { - /* Rather then adjusting the selection (which the user would notice) + /* Rather than adjusting the selection (which the user would notice) * tag all mirrored verts, then auto-merge those. */ BM_mesh_elem_hflag_disable_all(bm, BM_VERT, BM_ELEM_TAG, false); diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index 7e921d4fc3d..70ef5fcde7a 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -438,7 +438,7 @@ void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode) } /* if we've allocated new data, free the old data - * less hassle then checking before every alloc above */ + * less hassle than checking before every alloc above */ if (mi_data_prev && (mi_data_prev != mi->data)) { MEM_freeN(mi_data_prev); } |