From 0ba83fde1f4be18372dcd937627a24404a0aed8a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 8 Jan 2024 11:24:37 +1100 Subject: [PATCH] Cleanup: spelling in comments --- intern/cycles/blender/volume.cpp | 2 +- scripts/startup/bl_operators/presets.py | 2 +- source/blender/animrig/intern/bone_collections.cc | 8 ++++---- .../blender/animrig/intern/bone_collections_test.cc | 4 ++-- source/blender/blenkernel/BKE_node_socket_value.hh | 2 +- source/blender/blenkernel/BKE_volume_grid.hh | 6 +++--- .../blender/blenkernel/BKE_volume_grid_file_cache.hh | 4 ++-- source/blender/blenkernel/BKE_volume_grid_fwd.hh | 2 +- source/blender/blenkernel/intern/volume_grid.cc | 4 ++-- .../shaders/compositor_defocus_radius_from_depth.glsl | 2 +- .../blender/draw/engines/eevee_next/eevee_pipeline.cc | 2 +- .../draw/engines/eevee_next/eevee_shader_shared.hh | 2 +- .../shaders/eevee_deferred_combine_frag.glsl | 2 +- .../eevee_next/shaders/eevee_deferred_light_frag.glsl | 2 +- .../engines/eevee_next/shaders/eevee_gbuffer_lib.glsl | 8 ++++---- .../eevee_next/shaders/eevee_horizon_scan_comp.glsl | 2 +- .../shaders/eevee_ray_denoise_bilateral_comp.glsl | 2 +- .../shaders/eevee_ray_trace_planar_comp.glsl | 2 +- .../shaders/eevee_ray_trace_screen_comp.glsl | 4 ++-- source/blender/editors/armature/bone_collections.cc | 11 ++++++----- source/blender/editors/include/UI_interface_c.hh | 6 +++--- .../interface_template_bone_collection_tree.cc | 2 +- source/blender/editors/io/io_drop_import_file.cc | 2 +- source/blender/editors/sculpt_paint/sculpt_intern.hh | 2 +- .../editors/space_sequencer/sequencer_scopes.cc | 2 +- .../editors/space_sequencer/sequencer_scopes.hh | 2 +- .../space_sequencer/sequencer_timeline_draw.cc | 2 +- source/blender/gpu/metal/mtl_shader.hh | 2 +- source/blender/gpu/metal/mtl_shader_log.mm | 4 ++-- .../gpu/shaders/common/gpu_shader_common_curves.glsl | 4 ++-- source/blender/io/usd/intern/usd_armature_utils.h | 2 +- source/blender/io/usd/intern/usd_blend_shape_utils.cc | 6 +++--- source/blender/io/usd/intern/usd_blend_shape_utils.h | 6 +++--- source/blender/io/usd/intern/usd_reader_stage.cc | 2 +- source/blender/io/usd/intern/usd_reader_stage.h | 2 +- source/blender/io/usd/intern/usd_skel_convert.cc | 8 ++++---- source/blender/io/usd/intern/usd_skel_convert.h | 4 ++-- source/blender/io/usd/intern/usd_skel_root_utils.cc | 2 +- source/blender/io/usd/intern/usd_skel_root_utils.h | 2 +- source/blender/io/usd/intern/usd_writer_armature.cc | 8 +++++--- .../nodes/composite/nodes/node_composite_defocus.cc | 2 +- tools/check_source/check_spelling_config.py | 3 +++ 42 files changed, 77 insertions(+), 71 deletions(-) diff --git a/intern/cycles/blender/volume.cpp b/intern/cycles/blender/volume.cpp index e6a4033462e..6b23e28b9e6 100644 --- a/intern/cycles/blender/volume.cpp +++ b/intern/cycles/blender/volume.cpp @@ -257,7 +257,7 @@ class BlenderVolumeLoader : public VDBImageLoader { BL::Volume b_volume; #ifdef WITH_OPENVDB - /* Store tree user so that the openvdb grid that is shared with Blender is not unloaded. */ + /* Store tree user so that the OPENVDB grid that is shared with Blender is not unloaded. */ blender::bke::VolumeTreeAccessToken tree_access_token; #endif }; diff --git a/scripts/startup/bl_operators/presets.py b/scripts/startup/bl_operators/presets.py index a8e95797fba..e6bf691c45d 100644 --- a/scripts/startup/bl_operators/presets.py +++ b/scripts/startup/bl_operators/presets.py @@ -516,7 +516,7 @@ class AddPresetTrackingSettings(AddPresetBase, Operator): class AddPresetEEVEERaytracing(AddPresetBase, Operator): - """Add or remove an EEVEE raytracing preset""" + """Add or remove an EEVEE ray-tracing preset""" bl_idname = "render.eevee_raytracing_preset_add" bl_label = "Add Raytracing Preset" preset_menu = "RENDER_PT_eevee_next_raytracing_presets" diff --git a/source/blender/animrig/intern/bone_collections.cc b/source/blender/animrig/intern/bone_collections.cc index 84b6593960a..f2269790516 100644 --- a/source/blender/animrig/intern/bone_collections.cc +++ b/source/blender/animrig/intern/bone_collections.cc @@ -681,7 +681,7 @@ void ANIM_armature_bonecoll_remove_from_index(bArmature *armature, int index) armature_bonecoll_is_child_of( armature, parent_bcoll_index, active_collection_index - 1)) { - /* The child preceeding active_collection_index is a sibling of the removed collection. */ + /* The child preceding active_collection_index is a sibling of the removed collection. */ ANIM_armature_bonecoll_active_index_set(armature, active_collection_index - 1); } else { @@ -721,7 +721,7 @@ int ANIM_armature_bonecoll_get_index_by_name(bArmature *armature, const char *na return -1; } -/* Clear BONE_COLLECTION_ANCESTORS_VISIBLE on all decendents of this bone collection. */ +/** Clear #BONE_COLLECTION_ANCESTORS_VISIBLE on all decedents of this bone collection. */ static void ancestors_visible_descendants_clear(bArmature *armature, BoneCollection *parent_bcoll) { for (BoneCollection *bcoll : armature->collection_children(parent_bcoll)) { @@ -730,7 +730,7 @@ static void ancestors_visible_descendants_clear(bArmature *armature, BoneCollect } } -/* Set or clear BONE_COLLECTION_ANCESTORS_VISIBLE on all decendents of this bone collection. */ +/** Set or clear #BONE_COLLECTION_ANCESTORS_VISIBLE on all decedents of this bone collection. */ static void ancestors_visible_descendants_update(bArmature *armature, BoneCollection *parent_bcoll) { if (!parent_bcoll->is_visible_effectively()) { @@ -749,7 +749,7 @@ static void ancestors_visible_descendants_update(bArmature *armature, BoneCollec } } -/* Set/clear BONE_COLLECTION_ANCESTORS_VISIBLE on this bone collection and all its decendents. */ +/** Set/clear BONE_COLLECTION_ANCESTORS_VISIBLE on this bone collection and all its decedents. */ static void ancestors_visible_update(bArmature *armature, const BoneCollection *parent_bcoll, BoneCollection *bcoll) diff --git a/source/blender/animrig/intern/bone_collections_test.cc b/source/blender/animrig/intern/bone_collections_test.cc index ca15d0201d7..2384e631dbf 100644 --- a/source/blender/animrig/intern/bone_collections_test.cc +++ b/source/blender/animrig/intern/bone_collections_test.cc @@ -1495,7 +1495,7 @@ class ANIM_armature_bone_collections_liboverrides ANIM_armature_bone_collections_testlist::SetUp(); /* TODO: make this clone `arm` into `dst_arm`, instead of assuming the below - * code is still in sync with the superclass. */ + * code is still in sync with the super-class. */ memset(&dst_arm, 0, sizeof(dst_arm)); STRNCPY(dst_arm.id.name, "ARArmatureDST"); @@ -1524,7 +1524,7 @@ class ANIM_armature_bone_collections_liboverrides TEST_F(ANIM_armature_bone_collections_liboverrides, bcoll_insert_copy_after) { - /* Mimick that a new root, two children, and two grandchildren were added via library overrides. + /* Mimic that a new root, two children, and two grandchildren were added via library overrides. * These were saved in `arm`, and now need to be copied into `dst_arm`. */ BoneCollection *src_root = ANIM_armature_bonecoll_new(&arm, "new_root"); const int root_index = armature_bonecoll_find_index(&arm, src_root); diff --git a/source/blender/blenkernel/BKE_node_socket_value.hh b/source/blender/blenkernel/BKE_node_socket_value.hh index 39b2d6c1389..3352687253b 100644 --- a/source/blender/blenkernel/BKE_node_socket_value.hh +++ b/source/blender/blenkernel/BKE_node_socket_value.hh @@ -124,7 +124,7 @@ class SocketValueVariant { /** * Convert the stored value into a single value. For simple value access, this is not necessary, * because #get` does the conversion implicitly. However, it is necessary if one wants to use - * #get_single_ptr. Context-dependend fields or grids will just result in a fallback value. + * #get_single_ptr. Context-depended fields or grids will just result in a fallback value. * * The caller has to make sure that the stored value is a single value, field or grid. */ diff --git a/source/blender/blenkernel/BKE_volume_grid.hh b/source/blender/blenkernel/BKE_volume_grid.hh index e608e3f6295..ec0681aff30 100644 --- a/source/blender/blenkernel/BKE_volume_grid.hh +++ b/source/blender/blenkernel/BKE_volume_grid.hh @@ -31,7 +31,7 @@ namespace blender::bke::volume_grid { * * A grid contains the following: * - Transform: The mapping between index and object space. It also determines e.g. the voxel size. - * - Meta-data: Contains e.g. the name and grid class (fog volume or sdf) and potentially other + * - Meta-data: Contains e.g. the name and grid class (fog volume or SDF) and potentially other * data. * - Tree: This is the heavy data that contains all the voxel values. * @@ -44,12 +44,12 @@ namespace blender::bke::volume_grid { * with independent meta-data and transforms. The tree is only actually copied when necessary. * - Lazy loading of the entire grid or just the tree: When constructing the #VolumeGridData it is * possible to provide a callback that lazy-loads the grid when it is first accessed. This is - * especially benefitial when loading grids from a file and it's not clear in the beginning if + * especially beneficial when loading grids from a file and it's not clear in the beginning if * the tree is actually needed. It's also supported to just load the meta-data and transform * first and to load the tree only when it's used. This allows e.g. transforming or renaming the * grid without loading the tree. * - Unloading of the tree: It's possible to unload the tree data when it is not in use. This is - * only supported on a shared grid if the tree could be reloaded (e.g. by reading it from a vdb + * only supported on a shared grid if the tree could be reloaded (e.g. by reading it from a VDB * file) and if no one is currently accessing the grid data. */ class VolumeGridData : public ImplicitSharingMixin { diff --git a/source/blender/blenkernel/BKE_volume_grid_file_cache.hh b/source/blender/blenkernel/BKE_volume_grid_file_cache.hh index 60406731852..e3aa39f5f85 100644 --- a/source/blender/blenkernel/BKE_volume_grid_file_cache.hh +++ b/source/blender/blenkernel/BKE_volume_grid_file_cache.hh @@ -44,8 +44,8 @@ struct GridsFromFile { }; /** - * Get all the data stored in a .vdb file. This does not actually load the tree data, which is done - * on demand. + * Get all the data stored in a `.vdb` file. + * This does not actually load the tree data, which is done on demand. */ GridsFromFile get_all_grids_from_file(StringRef file_path, int simplify_level = 0); diff --git a/source/blender/blenkernel/BKE_volume_grid_fwd.hh b/source/blender/blenkernel/BKE_volume_grid_fwd.hh index 2904e986d81..2e0cf6b4314 100644 --- a/source/blender/blenkernel/BKE_volume_grid_fwd.hh +++ b/source/blender/blenkernel/BKE_volume_grid_fwd.hh @@ -89,7 +89,7 @@ void clear_tree(VolumeGridData &grid); /** * Makes sure that the volume grid is loaded afterwards. This is necessary to call this for - * correctness, because the grid will be loaded on demand anyway. Sometimes it may be benefitial + * correctness, because the grid will be loaded on demand anyway. Sometimes it may be beneficial * for performance to load the grid eagerly though. */ void load(const VolumeGridData &grid); diff --git a/source/blender/blenkernel/intern/volume_grid.cc b/source/blender/blenkernel/intern/volume_grid.cc index 4dcba497952..da1a303d096 100644 --- a/source/blender/blenkernel/intern/volume_grid.cc +++ b/source/blender/blenkernel/intern/volume_grid.cc @@ -16,7 +16,7 @@ namespace blender::bke::volume_grid { #ifdef WITH_OPENVDB /** - * Multiple #VolumeDataGrid can implictly share the same underlying tree with different + * Multiple #VolumeDataGrid can implicitly share the same underlying tree with different * meta-data/transforms. */ class OpenvdbTreeSharingInfo : public ImplicitSharingInfo { @@ -247,7 +247,7 @@ GVolumeGrid VolumeGridData::copy() const { std::lock_guard lock{mutex_}; this->ensure_grid_loaded(); - /* Can't use #MEM_new because the default construtor is private. */ + /* Can't use #MEM_new because the default constructor is private. */ VolumeGridData *new_copy = new (MEM_mallocN(sizeof(VolumeGridData), __func__)) VolumeGridData(); /* Makes a deep copy of the meta-data but shares the tree. */ new_copy->grid_ = grid_->copyGrid(); diff --git a/source/blender/compositor/realtime_compositor/shaders/compositor_defocus_radius_from_depth.glsl b/source/blender/compositor/realtime_compositor/shaders/compositor_defocus_radius_from_depth.glsl index 963e7211687..b38e6f41cae 100644 --- a/source/blender/compositor/realtime_compositor/shaders/compositor_defocus_radius_from_depth.glsl +++ b/source/blender/compositor/realtime_compositor/shaders/compositor_defocus_radius_from_depth.glsl @@ -15,7 +15,7 @@ void main() ivec2 texel = ivec2(gl_GlobalInvocationID.xy); float depth = texture_load(depth_tx, texel).x; - /* Compute Vu in equation (7). */ + /* Compute `Vu` in equation (7). */ const float distance_to_image_of_object = (focal_length * depth) / (depth - focal_length); /* Compute C in equation (8). Notice that the last multiplier was included in the absolute since diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc index 7a63cb27dff..4d40a2dd08f 100644 --- a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc +++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc @@ -510,7 +510,7 @@ void DeferredLayer::end_sync() RenderBuffersInfoData &rbuf_data = inst_.render_buffers.data; /* NOTE: For tile-based GPU architectures, barriers are not always needed if implicit local - * ordering is guarnteed via either blending order or explicit raster_order_groups. */ + * ordering is guaranteed via either blending order or explicit raster_order_groups. */ bool is_tbdr_arch_metal = (GPU_platform_architecture() == GPU_ARCHITECTURE_TBDR) && (GPU_backend_get_type() == GPU_BACKEND_METAL); diff --git a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh index ebfbe084803..aeec0cccd27 100644 --- a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh +++ b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh @@ -1206,7 +1206,7 @@ enum GBufferMode : uint32_t { GBUF_REFRACTION_COLORLESS = 13u, /** Special configurations. Packs multiple closures into less layer. */ - /* TODO(fclem): This is isn't currently working due to monolitic nature of the evaluation. */ + /* TODO(@fclem): This is isn't currently working due to monolithic nature of the evaluation. */ GBUF_METAL_CLEARCOAT = 15u, /** IMPORTANT: Needs to be less than 16 for correct packing in g-buffer header. */ diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_deferred_combine_frag.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_deferred_combine_frag.glsl index 8a696627eee..acfdc5f9b33 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_deferred_combine_frag.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_deferred_combine_frag.glsl @@ -59,7 +59,7 @@ void main() for (int i = 0; i < GBUFFER_LAYER_MAX && i < gbuf.closure_count; i++) { vec3 closure_light = load_radiance_direct(texel, i); - /* TODO(fclem): Enable for OpenGL and Vulkan once they fully support specialization constants. + /* TODO(fclem): Enable for OpenGL and VULKAN once they fully support specialization constants. */ #ifndef GPU_METAL bool use_combined_lightprobe_eval = uniform_buf.pipeline.use_combined_lightprobe_eval; diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_deferred_light_frag.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_deferred_light_frag.glsl index ed1220a4f53..19916ac4766 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_deferred_light_frag.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_deferred_light_frag.glsl @@ -87,7 +87,7 @@ void main() #ifdef MAT_SUBSURFACE if (has_sss) { /* Add to diffuse light for processing inside the Screen Space SSS pass. - * The tranlucent light is not outputed as a separate quantity because + * The translucent light is not outputted as a separate quantity because * it is over the closure_count. */ vec3 sss_profile = subsurface_transmission(gbuffer_closure_get(gbuf, 0).data.rgb, thickness); stack.cl[0].light_shadowed += stack.cl[gbuf.closure_count].light_shadowed * sss_profile; diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl index a37be65f70a..f351888e492 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl @@ -85,7 +85,7 @@ struct GBufferReader { /* -------------------------------------------------------------------- */ /** \name Load / Store macros * - * This allows for writting unit tests that read and write during the same shader invocation. + * This allows for writing unit tests that read and write during the same shader invocation. * \{ */ #ifdef GBUFFER_LOAD @@ -666,7 +666,7 @@ GBufferWriter gbuffer_pack(GBufferDataUndetermined data_in) if (has_diffuse) { if (has_sss) { - /* Subsurface need to be first to be outputed in first lighting texture. */ + /* Subsurface need to be first to be outputted in first lighting texture. */ gbuffer_closure_subsurface_pack(gbuf, data_in.diffuse); } else { @@ -692,7 +692,7 @@ GBufferWriter gbuffer_pack(GBufferDataUndetermined data_in) } } - /* TODO(fclem): Allow misxing of translucent and refraction. */ + /* TODO(@fclem): Allow mixing of translucent and refraction. */ if (has_translucent && !has_refraction) { gbuffer_closure_translucent_pack(gbuf, data_in.translucent); } @@ -833,4 +833,4 @@ GBufferReader gbuffer_read(samplerGBufferHeader header_tx, return gbuf; } -/** \} */ \ No newline at end of file +/** \} */ diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_horizon_scan_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_horizon_scan_comp.glsl index dd41965601b..e00bbe0eb2f 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_horizon_scan_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_horizon_scan_comp.glsl @@ -36,7 +36,7 @@ void main() gbuf_header_tx, gbuf_closure_tx, gbuf_normal_tx, texel_fullres); #ifndef GPU_METAL - /* TODO(fclem): Support specialization on OpenGL and Vulkan. */ + /* TODO(fclem): Support specialization on OpenGL and VULKAN. */ int closure_index = uniform_buf.raytrace.closure_index; #endif diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_bilateral_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_bilateral_comp.glsl index 36f2ebcc6c8..49d1d3af931 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_bilateral_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_bilateral_comp.glsl @@ -75,7 +75,7 @@ void main() gbuf_header_tx, gbuf_closure_tx, gbuf_normal_tx, texel_fullres); #ifndef GPU_METAL - /* TODO(fclem): Support specialization on OpenGL and Vulkan. */ + /* TODO(fclem): Support specialization on OpenGL and VULKAN. */ int closure_index = uniform_buf.raytrace.closure_index; #endif diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_planar_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_planar_comp.glsl index 45247a2fd3e..2679fc7f60c 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_planar_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_planar_comp.glsl @@ -36,7 +36,7 @@ void main() uniform_buf.raytrace.resolution_bias; #ifndef GPU_METAL - /* TODO(fclem): Support specialization on OpenGL and Vulkan. */ + /* TODO(fclem): Support specialization on OpenGL and VULKAN. */ int closure_index = uniform_buf.raytrace.closure_index; #endif diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_screen_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_screen_comp.glsl index 55155995e36..69bd4ae2dbe 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_screen_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_screen_comp.glsl @@ -38,7 +38,7 @@ void main() uniform_buf.raytrace.resolution_bias; #ifndef GPU_METAL - /* TODO(fclem): Support specialization on OpenGL and Vulkan. */ + /* TODO(fclem): Support specialization on OpenGL and VULKAN. */ int closure_index = uniform_buf.raytrace.closure_index; #endif @@ -78,7 +78,7 @@ void main() ray_view.max_time = 1000.0; #ifndef GPU_METAL - /* TODO(fclem): Support specialization on OpenGL and Vulkan. */ + /* TODO(fclem): Support specialization on OpenGL and VULKAN. */ bool trace_refraction = uniform_buf.raytrace.trace_refraction; #endif diff --git a/source/blender/editors/armature/bone_collections.cc b/source/blender/editors/armature/bone_collections.cc index 522c23b6d27..f1a8488f2ca 100644 --- a/source/blender/editors/armature/bone_collections.cc +++ b/source/blender/editors/armature/bone_collections.cc @@ -1023,11 +1023,12 @@ static bool move_to_collection_poll(bContext *C) /** * Encode the parameters into an integer, and return as void*. * - * This makes it possible to use these values and pass them directly as 'custom data' pointer to - * `uiItemMenuF()`. This makes it possible to give every menu a unique bone collection index for - * which it should show the child collections, without having to allocate memory or use static - * variables. See `move_to_collection_invoke()` in `object_edit.cc` for the alternative that I - * (Sybren) wanted to avoid. */ + * NOTE(@sybren): This makes it possible to use these values and pass them directly as + * 'custom data' pointer to `uiItemMenuF()`. This makes it possible to give every menu a unique + * bone collection index for which it should show the child collections, without having to allocate + * memory or use static variables. See `move_to_collection_invoke()` in `object_edit.cc` + * for the alternative that I wanted to avoid. + */ static void *menu_custom_data_encode(const int bcoll_index, const bool is_move_operation) { /* Add 1 to the index, so that it's never negative (it can be -1 to indicate 'all roots'). */ diff --git a/source/blender/editors/include/UI_interface_c.hh b/source/blender/editors/include/UI_interface_c.hh index 691aa7bf3dc..96c4e6962dd 100644 --- a/source/blender/editors/include/UI_interface_c.hh +++ b/source/blender/editors/include/UI_interface_c.hh @@ -2293,9 +2293,9 @@ uiLayout *uiLayoutRow(uiLayout *layout, bool align); * property name pair. This gives the caller flexibility to decide who should own the open-state. * * \param C: The context is necessary because sometimes the panel may be forced to be open by the - * context even of the open-property is `false`. This can happen with e.g. property search. - * \param layout: The `uiLayout` that should contain the subpanel. Only layouts that span the full - * width of the region are supported for now. + * context even of the open-property is `false`. This can happen with e.g. property search. + * \param layout: The `uiLayout` that should contain the sub-panel. + * Only layouts that span the full width of the region are supported for now. * \param name: Text that's shown in the panel header. It should already be translated. * \param open_prop_owner: Data that contains the open-property. * \param open_prop_name: Name of the open-property in `open_prop_owner`. diff --git a/source/blender/editors/interface/interface_template_bone_collection_tree.cc b/source/blender/editors/interface/interface_template_bone_collection_tree.cc index 5451f0c06e7..dd840dba377 100644 --- a/source/blender/editors/interface/interface_template_bone_collection_tree.cc +++ b/source/blender/editors/interface/interface_template_bone_collection_tree.cc @@ -219,7 +219,7 @@ class BoneCollectionItem : public AbstractTreeViewItem { uiItemL(sub, "", icon); } - /* Visibility eyecon. */ + /* Visibility eye icon. */ { uiLayout *visibility_sub = uiLayoutRow(sub, true); uiLayoutSetActive(visibility_sub, bone_collection_.is_visible_ancestors()); diff --git a/source/blender/editors/io/io_drop_import_file.cc b/source/blender/editors/io/io_drop_import_file.cc index f49bc96a5a5..28b2da176c7 100644 --- a/source/blender/editors/io/io_drop_import_file.cc +++ b/source/blender/editors/io/io_drop_import_file.cc @@ -26,7 +26,7 @@ static CLG_LogRef LOG = {"io.drop_import_file"}; -/* Retuns the list of file paths stored in #WM_OT_drop_import_file operator properties. */ +/** Returns the list of file paths stored in #WM_OT_drop_import_file operator properties. */ static blender::Vector drop_import_file_paths(const wmOperator *op) { blender::Vector result; diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.hh b/source/blender/editors/sculpt_paint/sculpt_intern.hh index 6f262ee5cb9..55345e4a1b6 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.hh +++ b/source/blender/editors/sculpt_paint/sculpt_intern.hh @@ -207,7 +207,7 @@ struct Node { bool applied; /* shape keys */ - char shapeName[MAX_NAME]; /* sizeof(KeyBlock::name). */ + char shapeName[MAX_NAME]; /* `sizeof(KeyBlock::name)`. */ /* Geometry modification operations. * diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.cc b/source/blender/editors/space_sequencer/sequencer_scopes.cc index 710a71820c5..5bbbae9129b 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.cc +++ b/source/blender/editors/space_sequencer/sequencer_scopes.cc @@ -58,7 +58,7 @@ static blender::float2 rgb_to_uv_normalized(const float rgb[3]) { /* Exact same math as rgb_to_yuv BT709 case. Duplicated here * since this function is called a lot, and non-inline function - * call plus colorspace switch in there overhead does add up. */ + * call plus color-space switch in there overhead does add up. */ float r = rgb[0], g = rgb[1], b = rgb[2]; /* We don't need y. */ float u = -0.09991f * r - 0.33609f * g + 0.436f * b; diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.hh b/source/blender/editors/space_sequencer/sequencer_scopes.hh index 85c626f576d..72b2062e6ab 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.hh +++ b/source/blender/editors/space_sequencer/sequencer_scopes.hh @@ -19,7 +19,7 @@ namespace blender::ed::seq { struct ScopeHistogram { /* Byte images just have bins for the 0..255 range. */ static constexpr int BINS_BYTE = 256; - /* Float images spead -0.25..+1.25 range over 512 bins. */ + /* Float images spread -0.25..+1.25 range over 512 bins. */ static constexpr int BINS_FLOAT = 512; static constexpr float FLOAT_VAL_MIN = -0.25f; static constexpr float FLOAT_VAL_MAX = 1.25f; diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc index 623f285ff37..71d5f981c6b 100644 --- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc @@ -517,7 +517,7 @@ static void draw_seq_waveform_overlay(TimelineDrawContext *timeline_ctx, CLAMP_MIN(value_min, -1.0f); } - /* We are drawing only half ot the waveform, mirroring the lower part upwards. + /* We are drawing only half to the waveform, mirroring the lower part upwards. * If both min and max are on the same side of zero line, we want to draw a bar * between them. If min and max cross zero, we want to fill bar from zero to max * of those. */ diff --git a/source/blender/gpu/metal/mtl_shader.hh b/source/blender/gpu/metal/mtl_shader.hh index 7dbcb40f0b4..6fcf43ef811 100644 --- a/source/blender/gpu/metal/mtl_shader.hh +++ b/source/blender/gpu/metal/mtl_shader.hh @@ -102,7 +102,7 @@ struct MTLRenderPipelineStateInstance { /* Common compute pipeline state. */ struct MTLComputePipelineStateCommon { - /* Threadgroup information is common for all PSO variants.*/ + /* Thread-group information is common for all PSO variants. */ int threadgroup_x_len = 1; int threadgroup_y_len = 1; int threadgroup_z_len = 1; diff --git a/source/blender/gpu/metal/mtl_shader_log.mm b/source/blender/gpu/metal/mtl_shader_log.mm index b397084745a..87f1288ce7b 100644 --- a/source/blender/gpu/metal/mtl_shader_log.mm +++ b/source/blender/gpu/metal/mtl_shader_log.mm @@ -56,7 +56,7 @@ const char *MTLLogParser::parse_line(const char *source_combined, int64_t file_start = src.find(needle); if (file_start == -1) { /* Can be generated code or wrapper code outside of the main sources. - * But should be already catched by the above case. */ + * But should be already caught by the above case. */ log_item.cursor.row = -1; wrapper_error_ = true; } @@ -74,7 +74,7 @@ const char *MTLLogParser::parse_line(const char *source_combined, } } else if (parsed_error_) { - /* Skip the redundant lines that we be outputed above the error. */ + /* Skip the redundant lines that we be outputted above the error. */ return skip_line(log_line); } else if (wrapper_error_) { diff --git a/source/blender/gpu/shaders/common/gpu_shader_common_curves.glsl b/source/blender/gpu/shaders/common/gpu_shader_common_curves.glsl index bcf7116aeac..e63ad4df409 100644 --- a/source/blender/gpu/shaders/common/gpu_shader_common_curves.glsl +++ b/source/blender/gpu/shaders/common/gpu_shader_common_curves.glsl @@ -208,8 +208,8 @@ void curves_vector(vec3 vector, vec3 end_slopes, out vec3 result) { - /* Evaluate each component on its curve map. The componenets are first normalized into the [0, 1] - * range. */ + /* Evaluate each component on its curve map. + * The components are first normalized into the [0, 1] range. */ vec3 parameters = (vector - range_minimums) * range_dividers; vec3 coordinates = compute_curve_map_coordinates(parameters); result.x = texture(curve_map, vec2(coordinates.x, layer)).x; diff --git a/source/blender/io/usd/intern/usd_armature_utils.h b/source/blender/io/usd/intern/usd_armature_utils.h index a7fb1f8f677..82d48a4c7b8 100644 --- a/source/blender/io/usd/intern/usd_armature_utils.h +++ b/source/blender/io/usd/intern/usd_armature_utils.h @@ -45,7 +45,7 @@ void get_armature_bone_names(const Object *ob_arm, bool use_deform, Vector protos = stage_->GetPrototypes(); for (const pxr::UsdPrim &proto_prim : protos) { diff --git a/source/blender/io/usd/intern/usd_reader_stage.h b/source/blender/io/usd/intern/usd_reader_stage.h index c28f44fe537..09e2178cc97 100644 --- a/source/blender/io/usd/intern/usd_reader_stage.h +++ b/source/blender/io/usd/intern/usd_reader_stage.h @@ -39,7 +39,7 @@ class USDStageReader { * traversal, for importing unused materials. */ blender::Vector material_paths_; - /* Readers for scenegraph instance prototypes. */ + /* Readers for scene-graph instance prototypes. */ ProtoReaderMap proto_readers_; public: diff --git a/source/blender/io/usd/intern/usd_skel_convert.cc b/source/blender/io/usd/intern/usd_skel_convert.cc index feb973fb397..7c366ddfe50 100644 --- a/source/blender/io/usd/intern/usd_skel_convert.cc +++ b/source/blender/io/usd/intern/usd_skel_convert.cc @@ -1116,7 +1116,7 @@ void skel_export_chaser(pxr::UsdStageRefPtr stage, const ObjExportMap &shape_key_mesh_export_map, const Depsgraph *depsgraph) { - /* We may need to compute the world transforms of certain prims when + /* We may need to compute the world transforms of certain primitives when * setting skinning data. Using a shared transform cache can make computing * the transforms more efficient. */ pxr::UsdGeomXformCache xf_cache(1.0); @@ -1152,7 +1152,7 @@ void skinned_mesh_export_chaser(pxr::UsdStageRefPtr stage, CLOG_WARN(&LOG, "Invalid armature modifier for skinned mesh %s", mesh_obj->id.name + 2); continue; } - /* Look up the USD skeleton correpsoning to the armature object. */ + /* Look up the USD skeleton corresponding to the armature object. */ const pxr::SdfPath *path = armature_export_map.lookup_ptr(arm_obj); if (!path) { CLOG_WARN(&LOG, "No export map entry for armature object %s", mesh_obj->id.name + 2); @@ -1175,7 +1175,7 @@ void shape_key_export_chaser(pxr::UsdStageRefPtr stage, { Map skel_to_mesh; - /* We will keep track of the mesh prims to clean up the temporary + /* We will keep track of the mesh primitives to clean up the temporary * weights attribute at the end. */ Vector mesh_prims; @@ -1194,7 +1194,7 @@ void shape_key_export_chaser(pxr::UsdStageRefPtr stage, continue; } - /* Keep track of all the mesh prims with blend shapes, for cleanup below. */ + /* Keep track of all the mesh primitives with blend shapes, for cleanup below. */ mesh_prims.append(mesh_prim); pxr::UsdSkelBindingAPI skel_api = pxr::UsdSkelBindingAPI::Apply(mesh_prim); diff --git a/source/blender/io/usd/intern/usd_skel_convert.h b/source/blender/io/usd/intern/usd_skel_convert.h index 910be403fa8..73291bdd31a 100644 --- a/source/blender/io/usd/intern/usd_skel_convert.h +++ b/source/blender/io/usd/intern/usd_skel_convert.h @@ -99,7 +99,7 @@ using ObjExportMap = Map; * \param stage: The stage * \param armature_export_map: Map armature objects to USD skeletons * \param skinned_mesh_export_map: Map mesh objects to USD skinned meshes - * \param shape_key_export_map: Map mesh objects with shape keye to USD meshes + * \param shape_key_export_map: Map mesh objects with shape-key to USD meshes * with blend shape targets * \param depsgraph: The dependency graph in which objects were evaluated */ @@ -128,7 +128,7 @@ void skinned_mesh_export_chaser(pxr::UsdStageRefPtr stage, * Complete the export process for shape keys. * * \param stage: The stage - * \param shape_key_export_map: Map mesh objects with shape keye to USD meshes + * \param shape_key_export_map: Map mesh objects with shape-key to USD meshes * with blend shape targets */ void shape_key_export_chaser(pxr::UsdStageRefPtr stage, diff --git a/source/blender/io/usd/intern/usd_skel_root_utils.cc b/source/blender/io/usd/intern/usd_skel_root_utils.cc index f302ceb3c42..4749a2d7d4f 100644 --- a/source/blender/io/usd/intern/usd_skel_root_utils.cc +++ b/source/blender/io/usd/intern/usd_skel_root_utils.cc @@ -95,7 +95,7 @@ void create_skel_roots(pxr::UsdStageRefPtr stage, const USDExportParams ¶ms) continue; } - /* Try to find a commmon ancestor of the skinned prim and its bound skeleton. */ + /* Try to find a common ancestor of the skinned prim and its bound skeleton. */ pxr::UsdSkelRoot prim_skel_root = pxr::UsdSkelRoot::Find(prim); pxr::UsdSkelRoot skel_skel_root = pxr::UsdSkelRoot::Find(skel.GetPrim()); diff --git a/source/blender/io/usd/intern/usd_skel_root_utils.h b/source/blender/io/usd/intern/usd_skel_root_utils.h index 4d450644a51..b8522c29484 100644 --- a/source/blender/io/usd/intern/usd_skel_root_utils.h +++ b/source/blender/io/usd/intern/usd_skel_root_utils.h @@ -11,7 +11,7 @@ namespace blender::io::usd { /** * We must structure the scene graph to encapsulate skinned prim under a UsdSkelRoot - * prim. Per the USD documentation, a SkelRoot is a + * prim. Per the USD documentation, a SkelRoot is a: * * "Boundable prim type used to identify a scope beneath which skeletally-posed primitives are * defined. A SkelRoot must be defined at or above a skinned primitive for any skinning behaviors diff --git a/source/blender/io/usd/intern/usd_writer_armature.cc b/source/blender/io/usd/intern/usd_writer_armature.cc index ed7f5bb4190..8b9f27253f9 100644 --- a/source/blender/io/usd/intern/usd_writer_armature.cc +++ b/source/blender/io/usd/intern/usd_writer_armature.cc @@ -31,9 +31,11 @@ namespace usdtokens { static const pxr::TfToken Anim("Anim", pxr::TfToken::Immortal); } // namespace usdtokens -/* Get the pose matrix for the given channe. The matrix is computed - * relative to its parent, if a parent exists. The returned matrix - * corresponds to the USD joint-local transform. */ +/** + * Get the pose matrix for the given channel. + * The matrix is computed relative to its parent, if a parent exists. + * The returned matrix corresponds to the USD joint-local transform. + */ static pxr::GfMatrix4d parent_relative_pose_mat(const bPoseChannel *pchan) { /* Note that the float matrix will be returned as GfMatrix4d, because diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.cc b/source/blender/nodes/composite/nodes/node_composite_defocus.cc index 200d571b37d..1d012b7405f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_defocus.cc +++ b/source/blender/nodes/composite/nodes/node_composite_defocus.cc @@ -256,7 +256,7 @@ class DefocusOperation : public NodeOperation { } /* Computes the distance in meters to the image of the focus point across a lens of the specified - * focal length. This computes Vp in equation (7) of the paper: + * focal length. This computes `Vp` in equation (7) of the paper: * * Potmesil, Michael, and Indranil Chakravarty. "A lens and aperture camera model for synthetic * image generation." ACM SIGGRAPH Computer Graphics 15.3 (1981): 297-305. */ diff --git a/tools/check_source/check_spelling_config.py b/tools/check_source/check_spelling_config.py index 79234078f0a..e2eadc5396f 100644 --- a/tools/check_source/check_spelling_config.py +++ b/tools/check_source/check_spelling_config.py @@ -99,6 +99,7 @@ dict_custom = { "deduplicating", "deduplication", "defocus", + "defocusing", "defragment", "defragmented", "defragmenting", @@ -349,6 +350,7 @@ dict_custom = { "sidedness", "simplices", "situationally", + "skeletally", "skinnable", "skippable", "sortable", @@ -486,6 +488,7 @@ dict_custom = { "unshadowed", "unshared", "unsharp", + "unspecialized", "unsqueezed", "unstretch", "unsubdivided",