From 4ddb7a33a4a57a753063731f64c7e5e679c67676 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 May 2020 16:42:31 +1000 Subject: Cleanup: spelling --- source/blender/blenkernel/BKE_camera.h | 2 +- source/blender/blenkernel/BKE_particle.h | 2 +- source/blender/blenkernel/intern/constraint.c | 4 ++-- source/blender/blenkernel/intern/fcurve.c | 4 ++-- source/blender/blenkernel/intern/multires_reshape_smooth.c | 2 +- source/blender/blenkernel/intern/particle_system.c | 4 ++-- source/blender/blenkernel/intern/scene.c | 2 +- source/blender/blenlib/intern/math_base_inline.c | 2 +- source/blender/blenloader/intern/versioning_250.c | 2 +- source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h | 2 +- source/blender/draw/intern/draw_cache_impl_mesh.c | 2 +- source/blender/editors/interface/interface_panel.c | 8 ++++---- source/blender/editors/sculpt_paint/sculpt_undo.c | 2 +- source/blender/editors/transform/transform_generics.c | 2 +- source/blender/io/alembic/intern/abc_customdata.h | 2 +- source/blender/io/alembic/intern/alembic_capi.cc | 3 +-- source/blender/io/collada/ErrorHandler.h | 2 +- source/blender/makesdna/DNA_space_types.h | 7 ++++--- 18 files changed, 27 insertions(+), 27 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index f93003dc423..812f5d520d7 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -22,7 +22,7 @@ /** \file * \ingroup bke - * \brief Camera datablock and utility functions. + * \brief Camera data-block and utility functions. */ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index ea81be05b03..00d010cd6d9 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -430,7 +430,7 @@ void psys_apply_child_modifiers(struct ParticleThreadContext *ctx, const float parent_orco[3]); void psys_sph_init(struct ParticleSimulationData *sim, struct SPHData *sphdata); -void psys_sph_finalise(struct SPHData *sphdata); +void psys_sph_finalize(struct SPHData *sphdata); void psys_sph_density(struct BVHTree *tree, struct SPHData *data, float co[3], float vars[2]); /* for anim.c */ diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 56bc3db2762..050e8d434ae 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -4695,7 +4695,7 @@ static void followtrack_evaluate_using_3d_position_object(FollowTrackContext *co MovieTrackingTrack *track = context->track; MovieTrackingObject *tracking_object = context->tracking_object; - /* Matrix of the object which is being solved prior to this contraint. */ + /* Matrix of the object which is being solved prior to this constraint. */ float obmat[4][4]; copy_m4_m4(obmat, cob->matrix); @@ -4720,7 +4720,7 @@ static void followtrack_evaluate_using_3d_position_camera(FollowTrackContext *co Object *camera_object = context->camera_object; MovieTrackingTrack *track = context->track; - /* Matrix of the object which is being solved prior to this contraint. */ + /* Matrix of the object which is being solved prior to this constraint. */ float obmat[4][4]; copy_m4_m4(obmat, cob->matrix); diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index d1a3e0f1cea..c0843e049f3 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -1482,8 +1482,8 @@ static float fcurve_eval_keyframes_extrapolate( return endpoint_bezt->vec[1][1] - (fac * dx); } - /* Use the gradient of the second handle (later) of neighbour to calculate the gradient and thus - * the value of the curve at evaltime */ + /* Use the gradient of the second handle (later) of neighbor to calculate the gradient and thus + * the value of the curve at evaluation time. */ int handle = direction_to_neighbor > 0 ? 0 : 2; float dx = endpoint_bezt->vec[1][0] - evaltime; float fac = endpoint_bezt->vec[1][0] - endpoint_bezt->vec[handle][0]; diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.c b/source/blender/blenkernel/intern/multires_reshape_smooth.c index 7312ac2bf5e..3564ae80d24 100644 --- a/source/blender/blenkernel/intern/multires_reshape_smooth.c +++ b/source/blender/blenkernel/intern/multires_reshape_smooth.c @@ -55,7 +55,7 @@ /* Surface refers to a simplified and lower-memory footprint representation of the limit surface. * * Used to store pre-calculated information which is expensive or impossible to evaluate when - * travesing the final limit surface. */ + * traversing the final limit surface. */ typedef struct SurfacePoint { float P[3]; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index df74b7a75da..31d51a74e7f 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2163,7 +2163,7 @@ static void psys_sph_flush_springs(SPHData *sphdata) BLI_buffer_field_free(&sphdata->new_springs); } -void psys_sph_finalise(SPHData *sphdata) +void psys_sph_finalize(SPHData *sphdata) { psys_sph_flush_springs(sphdata); @@ -4046,7 +4046,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) BLI_spin_end(&task_data.spin); - psys_sph_finalise(&sphdata); + psys_sph_finalize(&sphdata); break; } } diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 34249e0a8f7..15b003001e3 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1250,7 +1250,7 @@ bool BKE_scene_validate_setscene(Main *bmain, Scene *sce) /** * This function is needed to cope with fractional frames - including two Blender rendering - * features mblur (motion blur that renders 'subframes' and blurs them together), + * features mblur (motion blur that renders 'sub-frames' and blurs them together), * and fields rendering. */ float BKE_scene_frame_get(const Scene *scene) diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index 2ad9b53ba3d..1b388dcf11f 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -360,7 +360,7 @@ MINLINE int divide_floor_i(int a, int b) } /** - * Integer division that ceils the result, instead of flooring like normal C division. + * Integer division that returns the ceiling, instead of flooring like normal C division. */ MINLINE uint divide_ceil_u(uint a, uint b) { diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index a68a366f22b..eaeef0d52c1 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -2355,7 +2355,7 @@ void do_versions_after_linking_250(Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 258, 0)) { - /* Some very old (original comments claim pre-2.57) versionning that was wrongly done in + /* Some very old (original comments claim pre-2.57) versioning that was wrongly done in * lib-linking code... Putting it here just to be sure (this is also checked at runtime anyway * by `action_idcode_patch_check`). */ ID *id; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h index c3c90e5aae4..df8b295f5bb 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h @@ -28,7 +28,7 @@ namespace DEG { struct RootPChanMap { - /* ctor and dtor - Create and free the internal map respectively. */ + /* Constructor and destructor - Create and free the internal map respectively. */ RootPChanMap(); ~RootPChanMap(); diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 4488a044187..237c7bddfad 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -314,7 +314,7 @@ static void drw_mesh_weight_state_extract(Object *ob, wstate->alert_mode = ts->weightuser; if (paint_mode && ts->multipaint) { - /* Multipaint needs to know all selected bones, not just the active group. + /* Multi-paint needs to know all selected bones, not just the active group. * This is actually a relatively expensive operation, but caching would be difficult. */ wstate->defgroup_sel = BKE_object_defgroup_selected_get( ob, wstate->defgroup_len, &wstate->defgroup_sel_count); diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index f6838002ea5..54f60a05cfd 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -373,8 +373,8 @@ void UI_panels_free_instanced(bContext *C, ARegion *region) * don't match in any way. * * \param data: The list of data to check against the instanced panels. - * \param panel_type_func: Function to find the panel type idname for each item in the data list. - * For a readabilty and generality, this lookup happens separately for each type of panel list. + * \param panel_idname_func: Function to find the panel type idname for each item in the data list. + * For a readability and generality, this lookup happens separately for each type of panel list. */ bool UI_panel_list_matches_data(ARegion *region, ListBase *data, @@ -1143,8 +1143,8 @@ void ui_draw_aligned_panel(uiStyle *style, immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); GPU_blend(true); - /* Draw panel backdrop if it wasn't aleady been drawn by the single opauque round box earlier. - * Note: Subpanels blend with panels, so they can't be opaque. */ + /* Draw panel backdrop if it wasn't already been drawn by the single opaque round box earlier. + * Note: Sub-panels blend with panels, so they can't be opaque. */ if (show_background && !(draw_box_style && !is_subpanel)) { /* Draw the bottom subpanels . */ if (draw_box_style) { diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 4a449e529d5..d21552efafe 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -1570,7 +1570,7 @@ static void sculpt_undo_push_all_grids(Object *object) /* It is possible that undo push is done from an object state where there is no PBVH. This * happens, for example, when an operation which tagged for geometry update was performed prior - * to the current operation without making any stroke inbetween. + * to the current operation without making any stroke in between. * * Skip pushing nodes based on the following logic: on redo SCULPT_UNDO_COORDS will ensure * PBVH for the new base geometry, which will have same coordinates as if we create PBVH here. */ diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 069e49088de..b1e69dde0ac 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1626,7 +1626,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve } if (t_values_set_is_array && t->flag & T_INPUT_IS_VALUES_FINAL) { - /* For operators whose `t->values` is array, set contrain so that the + /* For operators whose `t->values` is array, set constraint so that the * orientation is more intuitive in the Redo Panel. */ for (int i = 3; i--;) { constraint_axis[i] |= t->values[i] != 0.0f; diff --git a/source/blender/io/alembic/intern/abc_customdata.h b/source/blender/io/alembic/intern/abc_customdata.h index c8fc821cb2d..96b57b08681 100644 --- a/source/blender/io/alembic/intern/abc_customdata.h +++ b/source/blender/io/alembic/intern/abc_customdata.h @@ -73,7 +73,7 @@ struct CDStreamConfig { const char **modifier_error_message; /* Alembic needs Blender to keep references to C++ objects (the destructors - * finalise the writing to ABC). This map stores OV2fGeomParam objects for the + * finalize the writing to ABC). This map stores OV2fGeomParam objects for the * 2nd and subsequent UV maps; the primary UV map is kept alive by the Alembic * mesh sample itself. */ std::map abc_uv_maps; diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index 987a3cacb3b..6ca9e82a26c 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -875,8 +875,7 @@ bool ABC_import(bContext *C, bool validate_meshes, bool as_background_job) { - /* Using new here since MEM_* funcs do not call ctor to properly initialize - * data. */ + /* Using new here since MEM_* functions do not call constructor to properly initialize data. */ ImportJobData *job = new ImportJobData(); job->bmain = CTX_data_main(C); job->scene = CTX_data_scene(C); diff --git a/source/blender/io/collada/ErrorHandler.h b/source/blender/io/collada/ErrorHandler.h index 9789e93cee9..0c082a3b9dd 100644 --- a/source/blender/io/collada/ErrorHandler.h +++ b/source/blender/io/collada/ErrorHandler.h @@ -46,7 +46,7 @@ class ErrorHandler : public COLLADASaxFWL::IErrorHandler { } private: - /** Disable default copy ctor. */ + /** Disable default copy constructor. */ ErrorHandler(const ErrorHandler &pre); /** Disable default assignment operator. */ const ErrorHandler &operator=(const ErrorHandler &pre); diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 8f4f066efbb..31a8d967ccf 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -833,9 +833,10 @@ typedef enum eFileSel_Params_RenameFlag { FILE_PARAMS_RENAME_POSTSCROLL_ACTIVE = 1 << 3, } eFileSel_Params_RenameFlag; -/* files in filesel list: file types - * Note we could use mere values (instead of bitflags) for file types themselves, - * but since we do not lack of bytes currently... +/** + * Files in the file selector list: file types + * Note we could use mere values (instead of bit-flags) for file types themselves, + * but since we do not lack of bytes currently. */ typedef enum eFileSel_File_Types { FILE_TYPE_BLENDER = (1 << 2), -- cgit v1.2.3