From fea335fe8bd01675243953e41f59f156e44f1e94 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 13 Feb 2021 17:44:51 +1100 Subject: Cleanup: spelling --- source/blender/blenkernel/BKE_cloth.h | 10 +++--- source/blender/blenkernel/intern/mesh_merge.c | 11 ++++--- source/blender/blenloader/intern/readfile.c | 4 +-- source/blender/blenloader/intern/versioning_260.c | 2 +- source/blender/blenloader/intern/versioning_270.c | 2 +- source/blender/draw/engines/eevee/eevee_sampling.c | 2 +- .../draw/engines/workbench/workbench_render.c | 2 +- .../editors/animation/anim_channels_defines.c | 2 +- source/blender/editors/gpencil/gpencil_data.c | 2 +- source/blender/editors/gpencil/gpencil_intern.h | 2 +- source/blender/editors/gpencil/gpencil_paint.c | 4 +-- source/blender/editors/gpencil/gpencil_primitive.c | 2 +- source/blender/editors/gpencil/gpencil_select.c | 2 +- source/blender/editors/include/ED_keyframes_edit.h | 2 +- source/blender/editors/include/UI_interface.h | 2 +- source/blender/editors/interface/view2d.c | 4 +-- source/blender/editors/object/object_add.c | 2 +- source/blender/editors/sculpt_paint/sculpt.c | 4 +-- source/blender/editors/space_clip/clip_buttons.c | 2 +- source/blender/editors/space_clip/tracking_ops.c | 2 +- source/blender/editors/space_file/filesel.c | 4 +-- .../editors/space_outliner/space_outliner.c | 2 +- .../editors/space_view3d/view3d_gizmo_camera.c | 2 +- source/blender/editors/transform/transform_snap.c | 2 +- source/blender/io/collada/DocumentImporter.cpp | 2 +- source/blender/makesdna/DNA_ID.h | 4 +-- source/blender/makesdna/DNA_action_types.h | 6 ++-- source/blender/makesdna/DNA_armature_types.h | 37 ++++++++++++---------- source/blender/makesdna/DNA_cloth_types.h | 6 ++-- source/blender/makesdna/DNA_constraint_types.h | 4 +-- source/blender/makesdna/DNA_curve_types.h | 4 +-- source/blender/makesdna/DNA_material_types.h | 4 +-- source/blender/makesdna/DNA_meta_types.h | 6 ++-- source/blender/makesdna/DNA_modifier_types.h | 10 +++--- source/blender/makesdna/DNA_movieclip_types.h | 2 +- source/blender/makesdna/DNA_node_types.h | 4 +-- source/blender/makesdna/DNA_object_force_types.h | 2 +- source/blender/makesdna/DNA_particle_types.h | 4 +-- source/blender/makesdna/DNA_rigidbody_types.h | 14 ++++---- source/blender/makesdna/DNA_scene_types.h | 24 +++++++------- source/blender/makesdna/DNA_screen_types.h | 6 ++-- source/blender/makesdna/DNA_space_types.h | 2 +- source/blender/makesdna/DNA_tracking_types.h | 2 +- source/blender/makesdna/DNA_userdef_types.h | 2 +- source/blender/makesrna/intern/rna_tracking.c | 2 +- .../blender/windowmanager/intern/wm_toolsystem.c | 2 +- 46 files changed, 115 insertions(+), 109 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index e9267955d70..04fcdd6ed6f 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -131,13 +131,13 @@ typedef struct ClothVertex { * The definition of a spring. */ typedef struct ClothSpring { - int ij; /* Pij from the paper, one end of the spring. */ - int kl; /* Pkl from the paper, one end of the spring. */ + int ij; /* `Pij` from the paper, one end of the spring. */ + int kl; /* `Pkl` from the paper, one end of the spring. */ int mn; /* For hair springs: third vertex index; For bending springs: edge index; */ int *pa; /* Array of vert indices for poly a (for bending springs). */ int *pb; /* Array of vert indices for poly b (for bending springs). */ - int la; /* Length of *pa. */ - int lb; /* Length of *pb. */ + int la; /* Length of `*pa`. */ + int lb; /* Length of `*pb`. */ float restlen; /* The original length of the spring. */ float restang; /* The original angle of the bending springs. */ int type; /* Types defined in BKE_cloth.h ("springType"). */ @@ -208,7 +208,7 @@ typedef enum { /* SPRING FLAGS */ typedef enum { CLOTH_SPRING_FLAG_DEACTIVATE = (1 << 1), - CLOTH_SPRING_FLAG_NEEDED = (1 << 2), // springs has values to be applied + CLOTH_SPRING_FLAG_NEEDED = (1 << 2), /* Springs has values to be applied. */ } CLOTH_SPRINGS_FLAGS; ///////////////////////////////////////////////// diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index e118c1b6f6e..e3b5e5ea434 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -377,8 +377,8 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, BLI_gset_insert(poly_gset, mpgh); } - /* Can we optimise by reusing an old pmap ? How do we know an old pmap is stale ? */ - /* When called by MOD_array.c, the cddm has just been created, so it has no valid pmap. */ + /* Can we optimize by reusing an old `pmap`? How do we know an old `pmap` is stale? */ + /* When called by `MOD_array.c` the `cddm` has just been created, so it has no valid `pmap`. */ BKE_mesh_vert_poly_map_create( &poly_map, &poly_map_mem, mesh->mpoly, mesh->mloop, totvert, totpoly, totloop); } /* done preparing for fast poly compare */ @@ -411,9 +411,10 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, continue; } if (merge_mode == MESH_MERGE_VERTS_DUMP_IF_EQUAL) { - /* Additional condition for face dump: target vertices must make up an identical face */ - /* The test has 2 steps: (1) first step is fast ghash lookup, but not failproof */ - /* (2) second step is thorough but more costly poly compare */ + /* Additional condition for face dump: target vertices must make up an identical face. + * The test has 2 steps: + * 1) first step is fast `ghash` lookup, but not fail-proof. + * 2) second step is thorough but more costly poly compare. */ int i_poly, v_target; bool found = false; PolyKey pkey; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c90572a68a6..6528e1cdf79 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2740,7 +2740,7 @@ static void lib_link_window_scene_data_restore(wmWindow *win, Scene *scene, View v3d->localvd->camera = scene->camera; - /* Localview can become invalid during undo/redo steps, + /* Local-view can become invalid during undo/redo steps, * so we exit it when no could be found. */ for (base = view_layer->object_bases.first; base; base = base->next) { if (base->local_view_bits & v3d->local_view_uuid) { @@ -2752,7 +2752,7 @@ static void lib_link_window_scene_data_restore(wmWindow *win, Scene *scene, View v3d->localvd = NULL; v3d->local_view_uuid = 0; - /* Regionbase storage is different depending if the space is active. */ + /* Region-base storage is different depending if the space is active. */ ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase : &sl->regionbase; LISTBASE_FOREACH (ARegion *, region, regionbase) { diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 3b9ad64770d..7c5eefa60f7 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -75,7 +75,7 @@ # include "BKE_writeffmpeg.h" #endif -#include "IMB_imbuf.h" /* for proxy / timecode versioning stuff */ +#include "IMB_imbuf.h" /* for proxy / time-code versioning stuff. */ #include "NOD_common.h" #include "NOD_texture.h" diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index d8ab8d6f32a..d86ddc5b646 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1429,7 +1429,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (clip->tracking.stabilization.scale == 0.0f) { /* ensure init. - * Was previously used for autoscale only, + * Was previously used for auto-scale only, * now used always (as "target scale") */ clip->tracking.stabilization.scale = 1.0f; } diff --git a/source/blender/draw/engines/eevee/eevee_sampling.c b/source/blender/draw/engines/eevee/eevee_sampling.c index aa11f072fa5..da4bd20106c 100644 --- a/source/blender/draw/engines/eevee/eevee_sampling.c +++ b/source/blender/draw/engines/eevee/eevee_sampling.c @@ -38,7 +38,7 @@ void EEVEE_sample_ball(int sample_ofs, float radius, float rsample[3]) BLI_halton_3d(ht_primes, ht_offset, sample_ofs, ht_point); - /* Decorelate AA and shadow samples. (see T68594) */ + /* De-correlate AA and shadow samples. (see T68594) */ ht_point[0] = fmod(ht_point[0] * 1151.0, 1.0); ht_point[1] = fmod(ht_point[1] * 1069.0, 1.0); ht_point[2] = fmod(ht_point[2] * 1151.0, 1.0); diff --git a/source/blender/draw/engines/workbench/workbench_render.c b/source/blender/draw/engines/workbench/workbench_render.c index 47592578c34..f2d178f6565 100644 --- a/source/blender/draw/engines/workbench/workbench_render.c +++ b/source/blender/draw/engines/workbench/workbench_render.c @@ -54,7 +54,7 @@ static void workbench_render_matrices_init(RenderEngine *engine, Depsgraph *deps /* TODO(sergey): Shall render hold pointer to an evaluated camera instead? */ struct Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, RE_GetCamera(engine->re)); - /* Set the persective, view and window matrix. */ + /* Set the perspective, view and window matrix. */ float winmat[4][4], viewmat[4][4], viewinv[4][4]; RE_GetCameraWindow(engine->re, ob_camera_eval, winmat); diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 24bb58535a5..2bfa417eb78 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -4161,7 +4161,7 @@ static void ANIM_init_channel_typeinfo_data(void) /* Get type info from given channel type */ const bAnimChannelType *ANIM_channel_get_typeinfo(bAnimListElem *ale) { - /* santiy checks */ + /* Sanity checks. */ if (ale == NULL) { return NULL; } diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 3be913f342d..d33545f5b22 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -2022,7 +2022,7 @@ static void gpencil_brush_delete_mode_brushes(Main *bmain, } } - /* Before delete, unpinn any material of the brush. */ + /* Before delete, un-pin any material of the brush. */ if ((brush->gpencil_settings) && (brush->gpencil_settings->material != NULL)) { brush->gpencil_settings->material = NULL; brush->gpencil_settings->flag &= ~GP_BRUSH_MATERIAL_PINNED; diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 5fea46626d5..f3e6129b8ae 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -341,7 +341,7 @@ bool gpencil_brush_create_presets_poll(bContext *C); extern ListBase gpencil_strokes_copypastebuf; -/* Build a map for converting between old colornames and destination-color-refs */ +/* Build a map for converting between old color-names and destination-color-refs. */ struct GHash *gpencil_copybuf_validate_colormap(struct bContext *C); /* Stroke Editing ------------------------------------ */ diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 7e0fd2f2675..20bed64178a 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -149,9 +149,9 @@ typedef struct tGPsdata { Scene *scene; struct Depsgraph *depsgraph; - /** current object. */ + /** Current object. */ Object *ob; - /** Obeject eval. */ + /** Evaluated object. */ Object *ob_eval; /** window where painting originated. */ wmWindow *win; diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index db0b9dd035f..251aece687a 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -1276,7 +1276,7 @@ static int gpencil_primitive_invoke(bContext *C, wmOperator *op, const wmEvent * /* set cursor to indicate modal */ WM_cursor_modal_set(win, WM_CURSOR_CROSS); - /* update sindicator in header */ + /* Updates indicator in header. */ gpencil_primitive_status_indicators(C, tgpi); DEG_id_tag_update(&gpd->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY); WM_event_add_notifier(C, NC_GPENCIL | NA_EDITED, NULL); diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index a00d21bf88a..a85b84f462f 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -645,7 +645,7 @@ static bool gpencil_select_same_material(bContext *C) CTX_DATA_END; } - /* free memomy */ + /* Free memory. */ if (selected_colors != NULL) { BLI_gset_free(selected_colors, NULL); } diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 63f124798aa..cf90a21f799 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -300,7 +300,7 @@ short bezt_to_cfraelem(KeyframeEditData *ked, struct BezTriple *bezt); */ void bezt_remap_times(KeyframeEditData *ked, struct BezTriple *bezt); -/* ------ 1.5-D Region Testing Uitls (Lasso/Circle Select) ------- */ +/* ------ 1.5-D Region Testing Utilities (Lasso/Circle Select) ------- */ /* XXX: These are temporary, * until we can unify GP/Mask Keyframe handling and standard FCurve Keyframe handling */ diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 066d262cc44..67cd4f020be 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -106,7 +106,7 @@ typedef struct uiPopupBlockHandle uiPopupBlockHandle; typedef enum eUIEmbossType { UI_EMBOSS = 0, /* use widget style for drawing */ UI_EMBOSS_NONE = 1, /* Nothing, only icon and/or text */ - UI_EMBOSS_PULLDOWN = 2, /* Pulldown menu style */ + UI_EMBOSS_PULLDOWN = 2, /* Pull-down menu style */ UI_EMBOSS_RADIAL = 3, /* Pie Menu */ /** * The same as #UI_EMBOSS_NONE, unless the button has diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 59aee0fde29..e4dad0f1a53 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -616,7 +616,7 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize) if ((width != curwidth) || (height != curheight)) { float temp, dh; - /* resize from centerpoint, unless otherwise specified */ + /* Resize from center-point, unless otherwise specified. */ if (width != curwidth) { if (v2d->keepofs & V2D_LOCKOFS_X) { cur->xmax += width - BLI_rctf_size_x(cur); @@ -1058,7 +1058,7 @@ void UI_view2d_zoom_cache_reset(void) /* While scaling we can accumulate fonts at many sizes (~20 or so). * Not an issue with embedded font, but can use over 500Mb with i18n ones! See T38244. */ - /* note: only some views draw text, we could check for this case to avoid clearning cache */ + /* Note: only some views draw text, we could check for this case to avoid cleaning cache. */ BLF_cache_clear(); } diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index b6b6dcfaa59..5c69e21e14e 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2300,7 +2300,7 @@ static void make_object_duplilist_real(bContext *C, /* OK to keep most of the members uninitialized, * they won't be read, this is simply for a hash lookup. */ DupliObject dob_key; - /* We are looking one step upper in hierarchy, so we need to 'shift' the persitent_id, + /* We are looking one step upper in hierarchy, so we need to 'shift' the `persistent_id`, * ignoring the first item. * We only check on persistent_id here, since we have no idea what object it might be. */ memcpy(&dob_key.persistent_id[0], diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index d1028e5f542..1b19fa2b976 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -6485,7 +6485,7 @@ static void do_tiled( } } - /* First do the "untiled" position to initialize the stroke for this location. */ + /* First do the "un-tiled" position to initialize the stroke for this location. */ cache->tile_pass = 0; action(sd, ob, brush, ups); @@ -9706,7 +9706,7 @@ static int dyntopo_detail_size_edit_invoke(bContext *C, wmOperator *op, const wm copy_m4_m4(cd->gizmo_mat, cursor_trans); mul_m4_m4_post(cd->gizmo_mat, cursor_rot); - /* Initize the position of the triangle vertices. */ + /* Initialize the position of the triangle vertices. */ const float y_axis[3] = {0.0f, cd->radius, 0.0f}; for (int i = 0; i < 3; i++) { zero_v3(cd->preview_tri[i]); diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index 632f3c5147f..d555238e949 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -804,7 +804,7 @@ void uiTemplateMovieclipInformation(uiLayout *layout, ImBuf *ibuf = BKE_movieclip_get_ibuf_flag(clip, user, clip->flag, MOVIECLIP_CACHE_SKIP); int width, height; - /* Display frame dimensions, channels number and byffer type. */ + /* Display frame dimensions, channels number and buffer type. */ BKE_movieclip_get_size(clip, user, &width, &height); char str[1024]; diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index a903aeed380..bcac4d94bf0 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -110,7 +110,7 @@ static int add_marker_invoke(bContext *C, wmOperator *op, const wmEvent *event) ARegion *region = CTX_wm_region(C); if (!RNA_struct_property_is_set(op->ptr, "location")) { - /* If location is not set, use mouse positio nas default. */ + /* If location is not set, use mouse position as default. */ float co[2]; ED_clip_mouse_pos(sc, region, event->mval, co); RNA_float_set_array(op->ptr, "location", co); diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 6e5791cad52..6917893ab5f 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -280,7 +280,7 @@ static FileSelectParams *fileselect_ensure_updated_file_params(SpaceFile *sfile) params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_VOLUME : 0; } if ((prop = RNA_struct_find_property(op->ptr, "filter_glob"))) { - /* Protection against pyscripts not setting proper size limit... */ + /* Protection against Python scripts not setting proper size limit. */ char *tmp = RNA_property_string_get_alloc( op->ptr, prop, params->filter_glob, sizeof(params->filter_glob), NULL); if (tmp != params->filter_glob) { @@ -418,7 +418,7 @@ static void fileselect_refresh_asset_params(FileAssetSelectParams *asset_params) FileSelectParams *base_params = &asset_params->base_params; bUserAssetLibrary *user_library = NULL; - /* Ensure valid repo, or fall-back to local one. */ + /* Ensure valid repository, or fall-back to local one. */ if (library->type == FILE_ASSET_LIBRARY_CUSTOM) { BLI_assert(library->custom_library_index >= 0); diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 87f81a2cc0e..5fde6e381e0 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -401,7 +401,7 @@ static void outliner_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, ID *old_i /* Some early out checks. */ if (!TREESTORE_ID_TYPE(old_id)) { - return; /* ID type is not used by outilner... */ + return; /* ID type is not used by outliner. */ } if (space_outliner->search_tse.id == old_id) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index a9928fa2dc0..20d766357e8 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -242,7 +242,7 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmGizmoGroup *gzgroup) WM_gizmo_target_property_def_rna_ptr(widget, gz_prop_type, &camera_ptr, prop, -1); } - /* This could be handled more elegently (split into two gizmo groups). */ + /* This could be handled more elegantly (split into two gizmo groups). */ if ((v3d->gizmo_show_camera & V3D_GIZMO_SHOW_CAMERA_LENS) == 0) { WM_gizmo_set_flag(cagzgroup->focal_len, WM_GIZMO_HIDDEN, true); WM_gizmo_set_flag(cagzgroup->ortho_scale, WM_GIZMO_HIDDEN, true); diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 6d04de34016..d0f91802fff 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -461,7 +461,7 @@ void applySnapping(TransInfo *t, float *vec) activeSnap(t)) { double current = PIL_check_seconds_timer(); - /* Time base quirky code to go around findnearest slowness */ + /* Time base quirky code to go around find-nearest slowness. */ /* TODO: add exception for object mode, no need to slow it down then. */ if (current - t->tsnap.last >= 0.01) { t->tsnap.calcSnap(t, vec); diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index 259bf901091..214b5207a96 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -657,7 +657,7 @@ std::vector *DocumentImporter::write_node(COLLADAFW::Node *node, } } - /* XXX: if there're multiple instances, only one is stored */ + /* XXX: if there are multiple instances, only one is stored. */ if (!ob) { goto finally; diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 00d0d4e3626..9d01617905f 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -467,7 +467,7 @@ typedef struct PreviewImage { } \ ((void)0) -/** id->flag (persitent). */ +/** id->flag (persistent). */ enum { /** Don't delete the datablock even if unused. */ LIB_FAKEUSER = 1 << 9, @@ -534,7 +534,7 @@ enum { /* tag data-block as having an extra user. */ LIB_TAG_EXTRAUSER = 1 << 2, - /* tag data-block as having actually increased usercount for the extra virtual user. */ + /* tag data-block as having actually increased user-count for the extra virtual user. */ LIB_TAG_EXTRAUSER_SET = 1 << 7, /* RESET_AFTER_USE tag newly duplicated/copied IDs. diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 96245e3b067..27374c451e9 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -290,13 +290,13 @@ typedef struct bPoseChannel { /** Matrix result of loc/quat/size, and where we put deform in, see next line */ float chan_mat[4][4]; /** - * Constraints accumulate here. in the end, pose_mat = bone->arm_mat * chan_mat + * Constraints accumulate here. in the end, `pose_mat = bone->arm_mat * chan_mat` * this matrix is object space. */ float pose_mat[4][4]; /** For display, pose_mat with bone length applied. */ float disp_mat[4][4]; - /** For display, pose_mat with bone length applied and translated to tai.l*/ + /** For display, pose_mat with bone length applied and translated to tail. */ float disp_tail_mat[4][4]; /** * Inverse result of constraints. @@ -653,7 +653,7 @@ typedef enum eActionGroup_Flag { * that affects a group of related settings (as defined by the user). */ typedef struct bAction { - /** ID-serialisation for relinking. */ + /** ID-serialization for relinking. */ ID id; /** Function-curves (FCurve). */ diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index de2d56bb264..09304ce09f2 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -42,23 +42,23 @@ struct AnimData; */ typedef struct Bone { - /** Next/prev elements within this list. */ + /** Next/previous elements within this list. */ struct Bone *next, *prev; /** User-Defined Properties on this Bone. */ IDProperty *prop; - /** Parent (ik parent if appropriate flag is set. */ + /** Parent (IK parent if appropriate flag is set). */ struct Bone *parent; - /** Children . */ + /** Children. */ ListBase childbase; - /** Name of the bone - must be unique within the armature, MAXBONENAME. */ + /** Name of the bone - must be unique within the armature, MAXBONENAME. */ char name[64]; - /** roll is input for editmode, length calculated. */ + /** Roll is input for edit-mode, length calculated. */ float roll; float head[3]; - /** head/tail and roll in Bone Space . */ + /** Head/tail and roll in Bone Space. */ float tail[3]; - /** rotation derived from head/tail/roll. */ + /** Rotation derived from head/tail/roll. */ float bone_mat[3][3]; int flag; @@ -67,21 +67,24 @@ typedef struct Bone { char _pad[7]; float arm_head[3]; - /** head/tail in Armature Space (rest pos). */ + /** Head/tail in Armature Space (rest pose). */ float arm_tail[3]; - /** matrix: (bonemat(b)+head(b))*arm_mat(b-1), rest po.s*/ + /** Matrix: `(bonemat(b)+head(b))*arm_mat(b-1)`, rest pose. */ float arm_mat[4][4]; - /** Roll in Armature Space (rest pos). */ + /** Roll in Armature Space (rest pose). */ float arm_roll; - /** dist, weight: for non-deformgroup deforms. */ + /** dist, weight: for non-deformgroup deforms. */ float dist, weight; - /** width: for block bones. keep in this order, transform!. */ + /** width: for block bones. keep in this order, transform!. */ float xwidth, length, zwidth; - /** Radius for head/tail sphere, defining deform as well, parent->rad_tip overrides rad_head. */ + /** + * Radius for head/tail sphere, defining deform as well, + * `parent->rad_tip` overrides `rad_head`. + */ float rad_head, rad_tail; - /** Curved bones settings - these define the "restpose" for a curved bone. */ + /** Curved bones settings - these define the "rest-pose" for a curved bone. */ float roll1, roll2; float curve_in_x, curve_in_y; float curve_out_x, curve_out_y; @@ -90,11 +93,11 @@ typedef struct Bone { float scale_in_x, scale_in_y; float scale_out_x, scale_out_y; - /** patch for upward compat, UNUSED!. */ + /** Patch for upward compatibility, UNUSED! */ float size[3]; /** Layers that bone appears on. */ int layer; - /** for B-bones. */ + /** For B-bones. */ short segments; /** Type of next/prev bone handles. */ @@ -126,7 +129,7 @@ typedef struct bArmature { /** Active bone. */ Bone *act_bone; - /** Active editbone (in editmode). */ + /** Active edit-bone (in edit-mode). */ struct EditBone *act_edbone; /** ID data is older than edit-mode data (TODO: move to edit-mode struct). */ diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 1eff7be3f15..386590ad26c 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -52,7 +52,7 @@ typedef struct ClothSimSettings { float Cvi; /** Gravity/external force vector. */ float gravity[3]; - /** This is the duration of our time step, computed.. */ + /** This is the duration of our time step, computed. */ float dt; /** The mass of the entire cloth. */ float mass; @@ -78,9 +78,9 @@ typedef struct ClothSimSettings { float time_scale; /** See SB. */ float maxgoal; - /** Scaling of effector forces (see softbody_calc_forces)..*/ + /** Scaling of effector forces (see #softbody_calc_forces). */ float eff_force_scale; - /** Scaling of effector wind (see softbody_calc_forces).. */ + /** Scaling of effector wind (see #softbody_calc_forces). */ float eff_wind_scale; float sim_time_old; float defgoal; diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index ddc1b3bd9d7..07fbf263d80 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -72,9 +72,9 @@ typedef struct bConstraint { /** Constraint name, MAX_NAME. */ char name[64]; - /** Amount of influence exherted by constraint (0.0-1.0). */ + /** Amount of influence exerted by constraint (0.0-1.0). */ float enforce; - /** Point along subtarget bone where the actual target is. 0=head (default for all), 1=tail. */ + /** Point along `subtarget` bone where the actual target is. 0=head (default for all), 1=tail. */ float headtail; /* old animation system, deprecated for 2.5. */ diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 3bf58203bef..b3f0708539a 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -600,10 +600,10 @@ enum { CU_CHINFO_BOLD = 1 << 0, CU_CHINFO_ITALIC = 1 << 1, CU_CHINFO_UNDERLINE = 1 << 2, - /** wordwrap occurred here */ + /** Word-wrap occurred here. */ CU_CHINFO_WRAP = 1 << 3, CU_CHINFO_SMALLCAPS = 1 << 4, - /** set at runtime, checks if case switching is needed */ + /** Set at runtime, checks if case switching is needed. */ CU_CHINFO_SMALLCAPS_CHECK = 1 << 5, /** Set at runtime, indicates char that doesn't fit in text boxes. */ CU_CHINFO_OVERFLOW = 1 << 6, diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 919bd18be80..884c2df6480 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -45,11 +45,11 @@ struct bNodeTree; typedef struct TexPaintSlot { /** Image to be painted on. */ struct Image *ima; - /** Customdata index for uv layer, MAX_NAM.E*/ + /** Custom-data index for uv layer, #MAX_NAME. */ char *uvname; /** Do we have a valid image and UV map. */ int valid; - /** Copy of node inteporlation setting. */ + /** Copy of node interpolation setting. */ int interp; } TexPaintSlot; diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index a827003a9a0..a991f654b09 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -128,9 +128,9 @@ typedef struct MetaBall { /* ml->type */ #define MB_BALL 0 -#define MB_TUBEX 1 /* depercated */ -#define MB_TUBEY 2 /* depercated */ -#define MB_TUBEZ 3 /* depercated */ +#define MB_TUBEX 1 /* deprecated. */ +#define MB_TUBEY 2 /* deprecated. */ +#define MB_TUBEZ 3 /* deprecated. */ #define MB_TUBE 4 #define MB_PLANE 5 #define MB_ELIPSOID 6 diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 29421430e5d..6e1c00bfca8 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1230,12 +1230,14 @@ typedef struct SolidifyModifierData { char defgrp_name[64]; char shell_defgrp_name[64]; char rim_defgrp_name[64]; - /** New surface offset leve.l*/ + /** New surface offset level. */ float offset; - /** Midpoint of the offset . */ + /** Midpoint of the offset. */ float offset_fac; - /** factor for the minimum weight to use when vgroups are used, - * avoids 0.0 weights giving duplicate geometry */ + /** + * Factor for the minimum weight to use when vertex-groups are used, + * avoids 0.0 weights giving duplicate geometry. + */ float offset_fac_vg; /** Clamp offset based on surrounding geometry. */ float offset_clamp; diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 11cdb48edf0..b72b7c41b1c 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -156,7 +156,7 @@ typedef struct MovieClipScopes { struct MovieTrackingTrack *track; /** Marker scopes are created for. */ struct MovieTrackingMarker *marker; - /** Scale used for sliding from previewe area. */ + /** Scale used for sliding from preview area. */ float slide_scale[2]; } MovieClipScopes; diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index fd9fcfa3232..a7b5be753d1 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -1226,7 +1226,7 @@ typedef struct NodeAttributeSeparateXYZ { /* script node flag */ #define NODE_SCRIPT_AUTO_UPDATE 1 -/* ies node mode */ +/* IES node mode. */ #define NODE_IES_INTERNAL 0 #define NODE_IES_EXTERNAL 1 @@ -1550,7 +1550,7 @@ enum { /* image */ #define CMP_NODE_IMAGE_USE_STRAIGHT_OUTPUT 1 -/* viewer and cmposite output */ +/* viewer and composite output. */ #define CMP_NODE_OUTPUT_IGNORE_ALPHA 1 /* Plane track deform node */ diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h index 3bd11d02b7a..7812ff6a4f1 100644 --- a/source/blender/makesdna/DNA_object_force_types.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -310,7 +310,7 @@ typedef struct SoftBody { struct Collection *collision_group; struct EffectorWeights *effector_weights; - /* reverse esimated obmatrix .. no need to store in blend file .. how ever who cares */ + /* Reverse estimated object-matrix (run-time data, no need to store in the file). */ float lcom[3]; float lrot[3][3]; float lscale[3][3]; diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 10fcca734b2..cc40e26b92b 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -118,10 +118,10 @@ typedef struct ParticleData { /** Boids data. */ BoidParticle *boid; - /** Amount of hair or keyed key.s*/ + /** Amount of hair or keyed keys. */ int totkey; - /** Dietime is not necessarily time+lifetime as. */ + /** Die-time is not necessarily time+lifetime as. */ float time, lifetime; /** Particles can die unnaturally (collision). */ float dietime; diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index 48f183e1e28..9a3b9e7d365 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -45,7 +45,7 @@ typedef struct RigidBodyWorld_Shared { struct ListBase ptcaches; /* References to Physics Sim objects. Exist at runtime only ---------------------- */ - /** Physics sim world (i.e. btDiscreteDynamicsWorld). */ + /** Physics sim world (i.e. #btDiscreteDynamicsWorld). */ void *physics_world; } RigidBodyWorld_Shared; @@ -63,7 +63,7 @@ typedef struct RigidBodyWorld { /** Array to access group objects by index, only used at runtime. */ struct Object **objects; - /** Group containing objects to use for Rigid Body Constraint.s*/ + /** Group containing objects to use for Rigid Body Constraints. */ struct Collection *constraints; char _pad[4]; @@ -72,19 +72,19 @@ typedef struct RigidBodyWorld { /** This pointer is shared between all evaluated copies. */ struct RigidBodyWorld_Shared *shared; - /** Moved to shared->pointcache. */ + /** Moved to `shared->pointcache`. */ struct PointCache *pointcache DNA_DEPRECATED; - /** Moved to shared->ptcaches. */ + /** Moved to `shared->ptcaches`. */ struct ListBase ptcaches DNA_DEPRECATED; /** Number of objects in rigid body group. */ int numbodies; - /** Number of simulation substeps steps taken per frame. */ + /** Number of simulation sub-steps steps taken per frame. */ short substeps_per_frame; /** Number of constraint solver iterations made per simulation step. */ short num_solver_iterations; - /** (eRigidBodyWorld_Flag) settings for this RigidBodyWorld. */ + /** (#eRigidBodyWorld_Flag) settings for this RigidBodyWorld. */ int flag; /** Used to speed up or slow down the simulation. */ float time_scale; @@ -96,7 +96,7 @@ typedef enum eRigidBodyWorld_Flag { RBW_FLAG_MUTED = (1 << 0), /* sim data needs to be rebuilt */ /* RBW_FLAG_NEEDS_REBUILD = (1 << 1), */ /* UNUSED */ - /* usse split impulse when stepping the simulation */ + /** Use split impulse when stepping the simulation. */ RBW_FLAG_USE_SPLIT_IMPULSE = (1 << 2), } eRigidBodyWorld_Flag; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index a7405b64bf9..33d31df4210 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1100,33 +1100,33 @@ typedef struct GP_Sculpt_Settings { struct GP_Sculpt_Guide guide; } GP_Sculpt_Settings; -/* GP_Sculpt_Settings.flag */ +/** #GP_Sculpt_Settings.flag */ typedef enum eGP_Sculpt_SettingsFlag { - /* enable falloff for multiframe editing */ + /** Enable falloff for multi-frame editing. */ GP_SCULPT_SETT_FLAG_FRAME_FALLOFF = (1 << 0), - /* apply primitive curve */ + /** Apply primitive curve. */ GP_SCULPT_SETT_FLAG_PRIMITIVE_CURVE = (1 << 1), - /* Scale thickness. */ + /** Scale thickness. */ GP_SCULPT_SETT_FLAG_SCALE_THICKNESS = (1 << 3), } eGP_Sculpt_SettingsFlag; -/* GP_Sculpt_Settings.gpencil_selectmode_sculpt */ +/** #GP_Sculpt_Settings.gpencil_selectmode_sculpt */ typedef enum eGP_Sculpt_SelectMaskFlag { - /* only affect selected points */ + /** Only affect selected points. */ GP_SCULPT_MASK_SELECTMODE_POINT = (1 << 0), - /* only affect selected strokes */ + /** Only affect selected strokes. */ GP_SCULPT_MASK_SELECTMODE_STROKE = (1 << 1), - /* only affect selected segmenst */ + /** only affect selected segments. */ GP_SCULPT_MASK_SELECTMODE_SEGMENT = (1 << 2), } eGP_Sculpt_SelectMaskFlag; -/* GP_Sculpt_Settings.gpencil_selectmode_vertex */ +/** #GP_Sculpt_Settings.gpencil_selectmode_vertex */ typedef enum eGP_vertex_SelectMaskFlag { - /* only affect selected points */ + /** Only affect selected points. */ GP_VERTEX_MASK_SELECTMODE_POINT = (1 << 0), - /* only affect selected strokes */ + /** Only affect selected strokes. */ GP_VERTEX_MASK_SELECTMODE_STROKE = (1 << 1), - /* only affect selected segmenst */ + /** Only affect selected segments. */ GP_VERTEX_MASK_SELECTMODE_SEGMENT = (1 << 2), } eGP_Vertex_SelectMaskFlag; diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 3a99a6f4ee8..8d3ac3a7814 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -285,7 +285,7 @@ typedef struct uiList { /* some list UI data need to be saved in file */ /** Defined as UI_MAX_NAME_STR. */ char list_id[64]; - /** How items are layedout in the list. */ + /** How items are laid out in the list. */ int layout_type; int flag; @@ -319,7 +319,7 @@ typedef struct TransformOrientation { typedef struct uiPreview { struct uiPreview *next, *prev; - /** Defined as UI_MAX_NAME_STR. */ + /** Defined as #UI_MAX_NAME_STR. */ char preview_id[64]; short height; char _pad1[6]; @@ -360,7 +360,7 @@ typedef struct ScrArea_Runtime { typedef struct ScrArea { struct ScrArea *next, *prev; - /** Ordered (bl, tl, tr, br). */ + /** Ordered (bottom-left, top-left, top-right, bottom-right). */ ScrVert *v1, *v2, *v3, *v4; /** If area==full, this is the parent. */ bScreen *full; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 51f8b58da62..4d705f3aa34 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -1545,7 +1545,7 @@ typedef struct SpaceNode { */ ListBase treepath; - /* The tree farthest down in the group heirarchy. */ + /* The tree farthest down in the group hierarchy. */ struct bNodeTree *edittree; struct bNodeTree *nodetree; diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index f08aee317a3..0e673aaec66 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -328,7 +328,7 @@ typedef struct MovieTrackingStabilization { float target_pos[2]; /** Expected target rotation of frame after raw stabilization, will be compensated. */ float target_rot; - /** Zoom factor known to be present on original footage. Also used for autoscale. */ + /** Zoom factor known to be present on original footage. Also used for auto-scale. */ float scale; /** Influence on location, scale and rotation. */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 0e31ec3494e..e6e2b6553c0 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -1207,7 +1207,7 @@ typedef enum eDupli_ID_Flags { USER_DUP_OBDATA = (~0) & ((1 << 24) - 1), - /* Those are not exposed as user preferences, only used internaly. */ + /* Those are not exposed as user preferences, only used internally. */ USER_DUP_OBJECT = (1 << 24), /* USER_DUP_COLLECTION = (1 << 25), */ /* UNUSED, keep because we may implement. */ diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index bcf75fb284f..c4a44556cf4 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -2001,7 +2001,7 @@ static void rna_def_trackingStabilization(BlenderRNA *brna) "Explicitly scale resulting frame to compensate zoom of original shot"); RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate"); - /* autoscale */ + /* Auto-scale. */ prop = RNA_def_property(srna, "use_autoscale", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_AUTOSCALE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index 5327062d9bb..5eaf026191f 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -620,7 +620,7 @@ bToolRef *WM_toolsystem_ref_set_by_id_ex( bContext *C, WorkSpace *workspace, const bToolKey *tkey, const char *name, bool cycle) { wmOperatorType *ot = WM_operatortype_find("WM_OT_tool_set_by_id", false); - /* On startup, Python operatores are not yet loaded. */ + /* On startup, Python operators are not yet loaded. */ if (ot == NULL) { return NULL; } -- cgit v1.2.3