diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-09 17:06:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-09 17:38:47 +0300 |
commit | b5d1e0ad1e58307def918f00bddce01041266056 (patch) | |
tree | a4baf15b2bd6d4f3ee7a908d44ea8d957ccf847f /source/blender/editors | |
parent | e49da071841ca16dcc4ffaa69866ed06b1c21be7 (diff) |
Cleanup: spelling
Diffstat (limited to 'source/blender/editors')
18 files changed, 41 insertions, 39 deletions
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 7ba6db92a47..41df3086fa8 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -1118,7 +1118,7 @@ static void poselib_preview_apply(bContext *C, wmOperator *op) else RNA_int_set(op->ptr, "pose_index", -2); /* -2 means don't apply any pose */ - /* old optimize trick... this enforces to bypass the depgraph + /* old optimize trick... this enforces to bypass the depsgraph * - note: code copied from transform_generics.c -> recalcData() */ // FIXME: shouldn't this use the builtin stuff? diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index 8b0bfadcbe7..0474f8a97e6 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -295,7 +295,7 @@ static void pose_slide_refresh(bContext *C, tPoseSlideOp *pso) /** * Although this lookup is not ideal, we won't be dealing with a lot of objects at a given time. - * But if it comes to that we can instead store prev/next frme in the #tPChanFCurveLink. + * But if it comes to that we can instead store prev/next frame in the #tPChanFCurveLink. */ static bool pose_frame_range_from_object_get(tPoseSlideOp *pso, Object *ob, float *prevFrameF, float *nextFrameF) { diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c index f31e53d2a1f..3e3aa13f184 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c @@ -369,7 +369,7 @@ static void gizmo_arrow_exit(bContext *C, wmGizmo *gz, const bool cancel) const bool is_prop_valid = WM_gizmo_target_property_is_valid(gz_prop); if (!cancel) { - /* Assign incase applying the opetration needs an updated offset + /* Assign incase applying the operation needs an updated offset * editmesh bisect needs this. */ if (is_prop_valid) { const int transform_flag = RNA_enum_get(arrow->gizmo.ptr, "transform"); diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c index 977b7c7a0a5..9579f7db196 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c @@ -472,7 +472,7 @@ static int gizmo_cage3d_modal( return OPERATOR_RUNNING_MODAL; } /* For transform logic to be manageable we operate in -0.5..0.5 2D space, - * no matter the size of the rectangle, mouse coorts are scaled to unit space. + * no matter the size of the rectangle, mouse coords are scaled to unit space. * The mouse coords have been projected into the matrix so we don't need to worry about axis alignment. * * - The cursor offset are multiplied by 'dims'. diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 65abac968e3..915793445db 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -209,7 +209,7 @@ eAutoPropButsReturn uiDefAutoButsRNA( col = uiLayoutColumn(split, false); } - /* may meed to add more cases here. + /* May need to add more cases here. * don't override enum flag names */ /* name is shown above, empty name for button below */ diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index c04fe58c12e..155c91ec037 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -454,8 +454,8 @@ static void findnearestvert__doClosest(void *userData, BMVert *eve, const float * * \param r_dist: (in/out), minimal distance to the nearest and at the end, actual distance * \param use_select_bias: - * - When true, selected vertice are given a 5 pixel bias to make them further than unselect verts. - * - When false, unselected vertice are given the bias. + * - When true, selected vertices are given a 5 pixel bias to make them further than unselect verts. + * - When false, unselected vertices are given the bias. * \param use_cycle: Cycle over elements within #FIND_NEAR_CYCLE_THRESHOLD_MIN in order of index. */ BMVert *EDBM_vert_find_nearest_ex( @@ -1757,7 +1757,7 @@ static bool mouse_mesh_loop(bContext *C, const int mval[2], bool extend, bool de if (select) { if (em->selectmode & SCE_SELECT_VERTEX) { /* Find nearest vert from mouse - * (initialize to large values incase only one vertex can be projected) */ + * (initialize to large values in case only one vertex can be projected) */ float v1_co[2], v2_co[2]; float length_1 = FLT_MAX; float length_2 = FLT_MAX; diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index c9365e8d0fd..67e455375df 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -1150,7 +1150,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) continue; } - /* We map back the names of the vertex groups to their corresponsing indices + /* We map back the names of the vertex groups to their corresponding indices * for this object. This is fast, and keep the logic for each vertex very simple. */ GSetIterator gs_iter; GSET_ITER(gs_iter, gset) { diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 5d653ffe00b..9fb200951ca 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -4943,7 +4943,7 @@ static int edbm_decimate_exec(bContext *C, wmOperator *op) } else { /** - * Calculate a new ratio based on faces that could be remoevd during decimation. + * Calculate a new ratio based on faces that could be removed during decimation. * needed so 0..1 has a meaningful range when operating on the selection. * * This doesn't have to be totally accurate, diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 3a4f9d461ec..f86a2388f87 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -919,8 +919,10 @@ UvElement *BM_uv_element_get(UvElementMap *map, BMFace *efa, BMLoop *l) /** \name Data Layer Checks * \{ */ -/* last_sel, use em->act_face otherwise get the last selected face in the editselections - * at the moment, last_sel is mainly useful for making sure the space image dosnt flicker */ +/** + * last_sel, use em->act_face otherwise get the last selected face in the editselections + * at the moment, last_sel is mainly useful for making sure the space image doesn't flicker. + */ BMFace *EDBM_uv_active_face_get(BMEditMesh *em, const bool sloppy, const bool selected) { BMFace *efa = NULL; diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index a1859bf70b0..8bfe51d09fa 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -267,15 +267,15 @@ void ED_mesh_mirrtopo_init( } if ((tot_unique <= tot_unique_prev) && (tot_unique_edges <= tot_unique_edges_prev)) { - /* Finish searching for unique values when 1 loop dosnt give a - * higher number of unique values compared to the previous loop */ + /* Finish searching for unique values when 1 loop dosn't give a + * higher number of unique values compared to the previous loop. */ break; } else { tot_unique_prev = tot_unique; tot_unique_edges_prev = tot_unique_edges; } - /* Copy the hash calculated this iter, so we can use them next time */ + /* Copy the hash calculated this iteration, so we can use them next time */ memcpy(topo_hash_prev, topo_hash, sizeof(MirrTopoHash_t) * totvert); topo_pass++; diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index c0e022df629..cd8b7d082ef 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -247,7 +247,7 @@ bool ED_vgroup_parray_alloc(ID *id, MDeformVert ***dvert_arr, int *dvert_tot, co * For use with tools that use ED_vgroup_parray_alloc with \a use_vert_sel == true. * This finds the unselected mirror deform verts and copies the weights to them from the selected. * - * \note \a dvert_array has mirrored weights filled in, incase cleanup operations are needed on both. + * \note \a dvert_array has mirrored weights filled in, in case cleanup operations are needed on both. */ void ED_vgroup_parray_mirror_sync( Object *ob, diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index a69b12be85b..e01f6e04086 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -446,7 +446,7 @@ void ED_area_do_msg_notify_tag_refresh( /** * Although there's no general support for minimizing areas, the status-bar can * be snapped to be only a few pixels high. A few pixels rather than 0 so it - * can be un-minimized again. We consider it pseudo-minimalized and don't draw + * can be un-minimized again. We consider it pseudo-minimized and don't draw * it then. */ static bool area_is_pseudo_minimized(const ScrArea *area) diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 863afcf70aa..4d1dd7eb1d6 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -796,8 +796,8 @@ static void paint_draw_alpha_overlay( UnifiedPaintSettings *ups, Brush *brush, ViewContext *vc, int x, int y, float zoom, ePaintMode mode) { - /* color means that primary brush texture is colured and - * secondary is used for alpha/mask control */ + /* Color means that primary brush texture is colored and + * secondary is used for alpha/mask control. */ bool col = ELEM(mode, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D, PAINT_MODE_VERTEX) ? true : false; eOverlayControlFlags flags = BKE_paint_get_overlay_flags(); gpuPushAttr(GPU_DEPTH_BUFFER_BIT | GPU_BLEND_BIT); diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 5e3d01d7f6a..0fdd3043d0c 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -83,9 +83,9 @@ #include "paint_intern.h" -/* this is a static resource for non-globality, - * Maybe it should be exposed as part of the - * paint operation, but for now just give a public interface */ +/* This is a static resource for non-global access. + * Maybe it should be exposed as part of the paint operation, but for now just give a public interface. + */ static ImagePaintPartialRedraw imapaintpartial = {0, 0, 0, 0, 0}; ImagePaintPartialRedraw *get_imapaintpartial(void) diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 1691b70a271..44e1c5b7696 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -1747,7 +1747,7 @@ static float project_paint_uvpixel_mask( } /* otherwise no mask normal is needed, were within the limit */ } - /* This only works when the opacity dosnt change while painting, stylus pressure messes with this + /* This only works when the opacity doesn't change while painting, stylus pressure messes with this * so don't use it. */ // if (ps->is_airbrush == 0) mask *= BKE_brush_alpha_get(ps->brush); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index ca12854aa7d..85bdba683cd 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1887,7 +1887,7 @@ static void do_wpaint_brush_draw_task_cb_ex( /* Test to see if the vertex coordinates are within the spherical brush region. */ if (sculpt_brush_test_sq_fn(&test, vd.co)) { /* Note: grids are 1:1 with corners (aka loops). - * For multires, take the vert whose loop cooresponds to the current grid. + * For multires, take the vert whose loop corresponds to the current grid. * Otherwise, take the current vert. */ const int v_index = has_grids ? data->me->mloop[vd.grid_indices[vd.g]].v : vd.vert_indices[vd.i]; const float grid_alpha = has_grids ? 1.0f / vd.gridsize : 1.0f; @@ -2675,7 +2675,7 @@ static void do_vpaint_brush_draw_task_cb_ex( /* Test to see if the vertex coordinates are within the spherical brush region. */ if (sculpt_brush_test_sq_fn(&test, vd.co)) { /* Note: Grids are 1:1 with corners (aka loops). - * For grid based pbvh, take the vert whose loop cooresponds to the current grid. + * For grid based pbvh, take the vert whose loop corresponds to the current grid. * Otherwise, take the current vert. */ const int v_index = has_grids ? data->me->mloop[vd.grid_indices[vd.g]].v : vd.vert_indices[vd.i]; const float grid_alpha = has_grids ? 1.0f / vd.gridsize : 1.0f; @@ -2769,7 +2769,7 @@ static void do_vpaint_brush_blur_task_cb_ex( { /* Test to see if the vertex coordinates are within the spherical brush region. */ if (sculpt_brush_test_sq_fn(&test, vd.co)) { - /* For grid based pbvh, take the vert whose loop cooresponds to the current grid. + /* For grid based pbvh, take the vert whose loop corresponds to the current grid. * Otherwise, take the current vert. */ const int v_index = has_grids ? data->me->mloop[vd.grid_indices[vd.g]].v : vd.vert_indices[vd.i]; const float grid_alpha = has_grids ? 1.0f / vd.gridsize : 1.0f; @@ -2888,7 +2888,7 @@ static void do_vpaint_brush_smear_task_cb_ex( { /* Test to see if the vertex coordinates are within the spherical brush region. */ if (sculpt_brush_test_sq_fn(&test, vd.co)) { - /* For grid based pbvh, take the vert whose loop cooresponds to the current grid. + /* For grid based pbvh, take the vert whose loop corresponds to the current grid. * Otherwise, take the current vert. */ const int v_index = has_grids ? data->me->mloop[vd.grid_indices[vd.g]].v : vd.vert_indices[vd.i]; const float grid_alpha = has_grids ? 1.0f / vd.gridsize : 1.0f; diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index 55a3da6f77c..afb0c833aa8 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -1543,7 +1543,7 @@ void ED_node_link_intersect_test(ScrArea *sa, int test) /* check if the node rect intersetcts the line from this point to next one */ if (BLI_rctf_isect_segment(&select->totr, coord_array[i], coord_array[i + 1])) { /* store the shortest distance to the upper left edge - * of all intersetctions found so far */ + * of all intersections found so far */ const float node_xy[] = {select->totr.xmin, select->totr.ymax}; /* to be precise coord_array should be clipped by select->totr, diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0fc36858e13..9985b0c9915 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2292,7 +2292,7 @@ static bool bmesh_test_dist_add( } /** - * \param mtx: Measure disatnce in this space. + * \param mtx: Measure distance in this space. * \param dists: Store the closest connected distance to selected vertices. * \param index: Optionally store the original index we're measuring the distance to (can be NULL). */ @@ -5806,17 +5806,17 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) if (t->mode == TFM_DUMMY) skip_invert = true; - /* NOTE: This is not really following copy-on-write design and we shoud not + /* NOTE: This is not really following copy-on-write design and we should not * be re-evaluating the evaluated object. But as the comment above mentioned * this is part of a hack. - * More proper solution would be to make a shallwe copy of the object and + * More proper solution would be to make a shallow copy of the object and * evaluate that, and access matrix of that evaluated copy of the object. * Might be more tricky than it sounds, if some logic later on accesses the * object matrix via td->ob->obmat. */ Object *object_eval = DEG_get_evaluated_object(t->depsgraph, ob); if (skip_invert == false && constinv == false) { object_eval->transflag |= OB_NO_CONSTRAINTS; /* BKE_object_where_is_calc checks this */ - /* It is possiblre to have transform data initialization prior to a + /* It is possible to have transform data initialization prior to a * complete dependency graph evaluated. Happens, for example, when * changing transformation mode. */ BKE_object_tfm_copy(object_eval, ob); @@ -5829,7 +5829,7 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) /* Copy newly evaluated fields to the original object, similar to how * active dependency graph will do it. */ copy_m4_m4(ob->obmat, object_eval->obmat); - /* Only copy negative scale flag, this is the only flag which is modifed by + /* Only copy negative scale flag, this is the only flag which is modified by * the BKE_object_where_is_calc(). The rest of the flags we need to keep, * otherwise we might loose dupli flags (see T61787). */ ob->transflag &= ~OB_NEG_SCALE; @@ -6465,8 +6465,8 @@ static void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t) TransData *td; int i; - /* rather then adjusting the selection (which the user would notice) - * tag all mirrored verts, then automerge those */ + /* Rather then 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); for (i = 0, td = tc->data; i < tc->data_len; i++, td++) { @@ -6528,8 +6528,8 @@ void special_aftertrans_update(bContext *C, TransInfo *t) FOREACH_TRANS_DATA_CONTAINER (t, tc) { EdgeSlideData *sld = tc->custom.mode.data; - /* free temporary faces to avoid automerging and deleting - * during cleanup - psy-fi */ + /* Free temporary faces to avoid auto-merging and deleting + * during cleanup - psy-fi. */ freeEdgeSlideTempFaces(sld); } } @@ -8357,8 +8357,8 @@ static void createTransGPencil(bContext *C, TransInfo *t) curvemapping_initialize(ts->gp_sculpt.cur_falloff); } - /* First Pass: Count the number of datapoints required for the strokes, - * (and additional info about the configuration - e.g. 2D/3D?) + /* First Pass: Count the number of data-points required for the strokes, + * (and additional info about the configuration - e.g. 2D/3D?). */ for (gpl = gpd->layers.first; gpl; gpl = gpl->next) { /* only editable and visible layers are considered */ |