diff options
38 files changed, 87 insertions, 87 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 020b9e10e60..fd14bbdccc5 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -396,8 +396,8 @@ class MultiDevice : public Device { size_t existing_size = mem.device_size; /* This is a hack to only allocate the tile buffers on denoising devices - * Similarily the tile buffers also need to be allocated separately on all devices so any - * overlap rendered for denoising does not interfer with each other */ + * Similarly the tile buffers also need to be allocated separately on all devices so any + * overlap rendered for denoising does not interfere with each other */ if (strcmp(mem.name, "RenderBuffers") == 0) { vector<device_ptr> device_pointers; device_pointers.reserve(devices.size()); diff --git a/intern/cycles/kernel/geom/geom_curve_intersect.h b/intern/cycles/kernel/geom/geom_curve_intersect.h index 86f7f246c6e..c04dbee52cc 100644 --- a/intern/cycles/kernel/geom/geom_curve_intersect.h +++ b/intern/cycles/kernel/geom/geom_curve_intersect.h @@ -20,7 +20,7 @@ CCL_NAMESPACE_BEGIN /* Curve primitive intersection functions. * * The code here was adapted from curve_intersector_sweep.h in Embree, to get - * an exact match betwee Embree CPU ray-tracing and our GPU ray-tracing. */ + * an exact match between Embree CPU ray-tracing and our GPU ray-tracing. */ #define CURVE_NUM_BEZIER_SUBDIVISIONS 3 #define CURVE_NUM_BEZIER_SUBDIVISIONS_UNSTABLE (CURVE_NUM_BEZIER_SUBDIVISIONS + 1) @@ -176,7 +176,7 @@ ccl_device bool curve_intersect_iterative(const float3 ray_dir, { const float length_ray_dir = len(ray_dir); - /* Error of curve evaluations is propertional to largest coordinate. */ + /* Error of curve evaluations is proportional to largest coordinate. */ const float4 box_min = min(min(curve[0], curve[1]), min(curve[2], curve[3])); const float4 box_max = max(min(curve[0], curve[1]), max(curve[2], curve[3])); const float4 box_abs = max(fabs(box_min), fabs(box_max)); diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 405af57effc..c45ae5553a8 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -594,7 +594,7 @@ void ObjectManager::device_update_transforms(DeviceScene *dscene, Scene *scene, numparticles += psys->particles.size(); } - /* Parallel object update, with grain size to avoid too much threadng overhead + /* Parallel object update, with grain size to avoid too much threading overhead * for individual objects. */ static const int OBJECTS_PER_TASK = 32; parallel_for(blocked_range<size_t>(0, scene->objects.size(), OBJECTS_PER_TASK), diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index 6b3217a2bea..91f241018ec 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -213,7 +213,7 @@ typedef struct PanelType { char context[BKE_ST_MAXNAME]; /* for buttons window */ char category[BKE_ST_MAXNAME]; /* for category tabs */ char owner_id[BKE_ST_MAXNAME]; /* for work-spaces to selectively show. */ - char parent_id[BKE_ST_MAXNAME]; /* parent idname for subpanels */ + char parent_id[BKE_ST_MAXNAME]; /* parent idname for sub-panels */ short space_type; short region_type; /* For popovers, 0 for default. */ diff --git a/source/blender/blenkernel/intern/armature_deform.c b/source/blender/blenkernel/intern/armature_deform.c index e757e30e524..44b50ab96d3 100644 --- a/source/blender/blenkernel/intern/armature_deform.c +++ b/source/blender/blenkernel/intern/armature_deform.c @@ -349,8 +349,7 @@ static void armature_vert_task_with_dvert(const ArmatureUserdata *data, pchan_bone_deform(pchan, weight, vec, dq, smat, co, &contrib); } } - /* if there are vertexgroups but not groups with bones - * (like for softbody groups) */ + /* If there are vertex-groups but not groups with bones (like for soft-body groups). */ if (deformed == 0 && use_envelope) { for (pchan = data->ob_arm->pose->chanbase.first; pchan; pchan = pchan->next) { if (!(pchan->bone->flag & BONE_NO_DEFORM)) { diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index dddbf7d45b2..c38d38bb2e7 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -416,11 +416,12 @@ static Collection *collection_duplicate_recursive(Main *bmain, } /** - * Make a deep copy (aka duplicate) of the given collection and all of its children, recusrsively. + * Make a deep copy (aka duplicate) of the given collection and all of its children, recursively. * * \warning This functions will clear all \a bmain #ID.idnew pointers, unless \a - * LIB_ID_DUPLICATE_IS_SUBPROCESS duplicate option is passed on, in which case caller is reponsible - * to reconstruct collection dependencies informations (i.e. call #BKE_main_collection_sync). + * #LIB_ID_DUPLICATE_IS_SUBPROCESS duplicate option is passed on, in which case caller is + * responsible to reconstruct collection dependencies information's + * (i.e. call #BKE_main_collection_sync). * * \param do_objects: If true, it will also make copies of objects. * \param do_obdata: If true, it will also make duplicates of objects, @@ -444,8 +445,8 @@ Collection *BKE_collection_duplicate(Main *bmain, bmain, parent, collection, duplicate_flags, duplicate_options); if (!is_subprocess) { - /* `collection_duplicate_recursive` will also tag our 'root' collection, whic is not required - * unless its duplication is a subprocess of another one. */ + /* `collection_duplicate_recursive` will also tag our 'root' collection, which is not required + * unless its duplication is a sub-process of another one. */ collection_new->id.tag &= ~LIB_TAG_NEW; /* This code will follow into all ID links using an ID tagged with LIB_TAG_NEW.*/ diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 74e3cc567ec..06c28776840 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -5415,10 +5415,10 @@ static bConstraint *add_new_constraint_internal(const char *name, short type) con->flag |= CONSTRAINT_OVERRIDE_LIBRARY_LOCAL; con->enforce = 1.0f; - /* Only open the main panel when constraints are created, not the subpanels. */ + /* Only open the main panel when constraints are created, not the sub-panels. */ con->ui_expand_flag = (1 << 0); if (ELEM(type, CONSTRAINT_TYPE_ACTION, CONSTRAINT_TYPE_SPLINEIK)) { - /* Expand the two subpanels in the cases where the main panel barely has any properties. */ + /* Expand the two sub-panels in the cases where the main panel barely has any properties. */ con->ui_expand_flag |= (1 << 1) | (1 << 2); } diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index ce98d76531f..9e2e91dc33a 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -160,7 +160,7 @@ static void lib_id_clear_library_data_ex(Main *bmain, ID *id) BKE_lib_libblock_session_uuid_renew(id); /* We need to tag this IDs and all of its users, conceptually new local ID and original linked - * ones are two completely different data-blocks that were virtually remaped, even though in + * ones are two completely different data-blocks that were virtually remapped, even though in * reality they remain the same data. For undo this info is critical now. */ DEG_id_tag_update_ex(bmain, id, ID_RECALC_COPY_ON_WRITE); ID *id_iter; diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 7c77746ea1c..327e8bfca7a 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -141,7 +141,7 @@ ModifierData *BKE_modifier_new(int type) md->type = type; md->mode = eModifierMode_Realtime | eModifierMode_Render; md->flag = eModifierFlag_OverrideLibrary_Local; - md->ui_expand_flag = 1; /* Only open the main panel at the beginning, not the subpanels. */ + md->ui_expand_flag = 1; /* Only open the main panel at the beginning, not the sub-panels. */ if (mti->flags & eModifierTypeFlag_EnableInEditmode) { md->mode |= eModifierMode_Editmode; diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 94b677c649c..b589db33edb 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -4787,7 +4787,7 @@ void psys_get_dupli_texture(ParticleSystem *psys, int num; /* XXX: on checking '(psmd->dm != NULL)' - * This is incorrect but needed for metaball evaluation. + * This is incorrect but needed for meta-ball evaluation. * Ideally this would be calculated via the depsgraph, however with meta-balls, * the entire scenes dupli's are scanned, which also looks into uncalculated data. * diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 4892e8d6ede..8455b60c894 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -1426,9 +1426,9 @@ void BKE_studiolight_init(void) BLI_addtail(&studiolights, sl); - /* go over the preset folder and add a studiolight for every image with its path */ - /* for portable installs (where USER and SYSTEM paths are the same), - * only go over LOCAL datafiles once */ + /* Go over the preset folder and add a studio-light for every image with its path. */ + /* For portable installs (where USER and SYSTEM paths are the same), + * only go over LOCAL data-files once. */ /* Also reserve icon space for it. */ if (!BKE_appdir_app_is_portable_install()) { studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, diff --git a/source/blender/blenlib/BLI_hash_tables.hh b/source/blender/blenlib/BLI_hash_tables.hh index c3b0b1f90e0..3bbdedec3e0 100644 --- a/source/blender/blenlib/BLI_hash_tables.hh +++ b/source/blender/blenlib/BLI_hash_tables.hh @@ -158,10 +158,10 @@ class LoadFactor { * two values of the key type are selected to indicate whether the slot is empty or removed. * * The classes below tell a slot implementation which special key values it can use. They can be - * used as KeyInfo in slot types like IntrusiveSetSlot and IntrusiveMapSlot. + * used as #KeyInfo in slot types like #IntrusiveSetSlot and #IntrusiveMapSlot. * - * A KeyInfo type has to implement a couple of static methods that are descriped in - * TemplatedKeyInfo. + * A #KeyInfo type has to implement a couple of static methods that are descried in + * #TemplatedKeyInfo. * * \{ */ diff --git a/source/blender/blenlib/BLI_index_range.hh b/source/blender/blenlib/BLI_index_range.hh index 25192429a5d..e2b74931537 100644 --- a/source/blender/blenlib/BLI_index_range.hh +++ b/source/blender/blenlib/BLI_index_range.hh @@ -211,7 +211,7 @@ class IndexRange { } /** - * Returns a new range, that contains a subinterval of the current one. + * Returns a new range, that contains a sub-interval of the current one. */ IndexRange slice(uint start, uint size) const { diff --git a/source/blender/blenlib/BLI_listbase_wrapper.hh b/source/blender/blenlib/BLI_listbase_wrapper.hh index a77e2d66458..9cf7fc5c0e0 100644 --- a/source/blender/blenlib/BLI_listbase_wrapper.hh +++ b/source/blender/blenlib/BLI_listbase_wrapper.hh @@ -20,10 +20,10 @@ /** \file * \ingroup bli * - * `blender::ListBaseWrapper` is a typed wrapper for the ListBase struct. That makes it safer and + * `blender::ListBaseWrapper` is a typed wrapper for the #ListBase struct. That makes it safer and * more convenient to use in C++ in some cases. However, if you find yourself iterating over a * linked list a lot, consider to convert it into a vector for further processing. This improves - * performance and debugability. + * performance and debug-ability. */ #include "BLI_listbase.h" diff --git a/source/blender/blenlib/BLI_map.hh b/source/blender/blenlib/BLI_map.hh index ea59579e996..7d5c8b19a78 100644 --- a/source/blender/blenlib/BLI_map.hh +++ b/source/blender/blenlib/BLI_map.hh @@ -98,7 +98,7 @@ template< */ uint32_t InlineBufferCapacity = (sizeof(Key) + sizeof(Value) < 100) ? 4 : 0, /** - * The strategy used to deal with collistions. They are defined in BLI_probing_strategies.hh. + * The strategy used to deal with collisions. They are defined in BLI_probing_strategies.hh. */ typename ProbingStrategy = DefaultProbingStrategy, /** diff --git a/source/blender/blenlib/BLI_set.hh b/source/blender/blenlib/BLI_set.hh index d23aa96e434..c3dec147ac6 100644 --- a/source/blender/blenlib/BLI_set.hh +++ b/source/blender/blenlib/BLI_set.hh @@ -30,7 +30,7 @@ * Every slot is in one of three states: empty, occupied or removed. If a slot is occupied, it * contains an instance of the key type. * - * Benchmarking and comparing hash tables is hard, because many factors influence the result. The + * Bench-marking and comparing hash tables is hard, because many factors influence the result. The * performance of a hash table depends on the combination of the hash function, probing strategy, * max load factor, key type, slot type and the data distribution. This implementation is designed * to be relatively fast by default in all cases. However, it also offers many customization @@ -49,21 +49,21 @@ * - Small buffer optimization is enabled by default, if the key is not too large. * - The methods `add_new` and `remove_contained` should be used instead of `add` and `remove` * whenever appropriate. Assumptions and intention are described better this way. - * - Lookups can be performed using types other than Key without conversion. For that use the - * methods ending with `_as`. The template parameters Hash and IsEqual have to support the other + * - Look-ups can be performed using types other than Key without conversion. For that use the + * methods ending with `_as`. The template parameters Hash and #IsEqual have to support the other * key type. This can greatly improve performance when the set contains strings. - * - The default constructor is cheap, even when a large InlineBufferCapacity is used. A large + * - The default constructor is cheap, even when a large #InlineBufferCapacity is used. A large * slot array will only be initialized when the first key is added. * - The `print_stats` method can be used to get information about the distribution of keys and * memory usage of the set. * - The method names don't follow the std::unordered_set names in many cases. Searching for such * names in this file will usually let you discover the new name. - * - There is a StdUnorderedSetWrapper class, that wraps std::unordered_set and gives it the same - * interface as blender::Set. This is useful for benchmarking. + * - There is a #StdUnorderedSetWrapper class, that wraps std::unordered_set and gives it the same + * interface as blender::Set. This is useful for bench-marking. * * Possible Improvements: - * - Use a branchless loop over slots in grow function (measured ~10% performance improvement when - * the distribution of occupied slots is suffiently random). + * - Use a branch-less loop over slots in grow function (measured ~10% performance improvement when + * the distribution of occupied slots is sufficiently random). * - Support max load factor customization. * - Improve performance with large data sets through software prefetching. I got fairly * significant improvements in simple tests (~30% faster). It still needs to be investigated how diff --git a/source/blender/blenlib/BLI_vector.hh b/source/blender/blenlib/BLI_vector.hh index 25e3d2f969b..c5c0d7e644a 100644 --- a/source/blender/blenlib/BLI_vector.hh +++ b/source/blender/blenlib/BLI_vector.hh @@ -147,7 +147,7 @@ class Vector { } /** - * Create a vector that contains copys of the values in the initialized list. + * Create a vector that contains copies of the values in the initialized list. * * This allows you to write code like: * Vector<int> vec = {3, 4, 5}; @@ -611,7 +611,7 @@ class Vector { } /** - * Finds the first occurence of the value, removes it and copies the last element to the hole in + * Finds the first occurrence of the value, removes it and copies the last element to the hole in * the vector. This takes O(n) time. */ void remove_first_occurrence_and_reorder(const T &value) diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index da67baf0ead..9d1981b3392 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -769,7 +769,7 @@ static void non_recursive_bvh_div_nodes_task_cb(void *__restrict userdata, * This functions builds an optimal implicit tree from the given leafs. * Where optimal stands for: * - The resulting tree will have the smallest number of branches; - * - At most only one branch will have NULL childs; + * - At most only one branch will have NULL children; * - All leafs will be stored at level N or N+1. * * This function creates an implicit tree on branches_array, @@ -777,7 +777,7 @@ static void non_recursive_bvh_div_nodes_task_cb(void *__restrict userdata, * * The tree is built per depth levels. First branches at depth 1.. then branches at depth 2.. etc.. * The reason is that we can build level N+1 from level N without any data dependencies.. - * thus it allows to use multithread building. + * thus it allows to use multi-thread building. * * To archive this is necessary to find how much leafs are accessible from a certain branch, * #BVHBuildHelper, #implicit_needed_branches and #implicit_leafs_index diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index bc06882b67a..92cfd09f191 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -2388,7 +2388,7 @@ void interp_m3_m3m3(float R[3][3], const float A[3][3], const float B[3][3], con mat3_polar_decompose(A, U_A, P_A); mat3_polar_decompose(B, U_B, P_B); - /* Quaterions cannot represent an axis flip. If such a singularity is detected, choose a + /* Quaternions cannot represent an axis flip. If such a singularity is detected, choose a * different decomposition of the matrix that still satisfies A = U_A * P_A but which has a * positive determinant and thus no axis flips. This resolves T77154. * diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 890be9ff3ef..d5ca47d726c 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1749,7 +1749,7 @@ void do_versions_after_linking_280(Main *bmain, ReportList *UNUSED(reports)) */ { /* Keep this block, even when empty. */ - /* Paint Brush. This ensure that the brush paints by default. Used during the develpment and + /* Paint Brush. This ensure that the brush paints by default. Used during the development and * patch review of the initial Sculpt Vertex Colors implementation (D5975) */ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) { if (brush->ob_mode & OB_MODE_SCULPT && brush->sculpt_tool == SCULPT_TOOL_PAINT) { diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index a9e0f8fb568..2e93df09e1e 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -269,7 +269,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) { /* Keep this block, even when empty. */ - /* Transition to saving expansion for all of a modifier's subpanels. */ + /* Transition to saving expansion for all of a modifier's sub-panels. */ if (!DNA_struct_elem_find(fd->filesdna, "ModifierData", "short", "ui_expand_flag")) { for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) { LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) { @@ -297,7 +297,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - /* Transition to saving expansion for all of a constraint's subpanels. */ + /* Transition to saving expansion for all of a constraint's sub-panels. */ if (!DNA_struct_elem_find(fd->filesdna, "bConstraint", "short", "ui_expand_flag")) { for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) { LISTBASE_FOREACH (bConstraint *, con, &object->constraints) { @@ -311,7 +311,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - /* Transition to saving expansion for all of grease pencil modifier's subpanels. */ + /* Transition to saving expansion for all of grease pencil modifier's sub-panels. */ if (!DNA_struct_elem_find(fd->filesdna, "GpencilModifierData", "short", "ui_expand_flag")) { for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) { LISTBASE_FOREACH (GpencilModifierData *, md, &object->greasepencil_modifiers) { @@ -325,7 +325,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - /* Transition to saving expansion for all of an effect's subpanels. */ + /* Transition to saving expansion for all of an effect's sub-panels. */ if (!DNA_struct_elem_find(fd->filesdna, "ShaderFxData", "short", "ui_expand_flag")) { for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) { LISTBASE_FOREACH (ShaderFxData *, fx, &object->shader_fx) { diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h index 3bdf92c2552..29fcf7ca0ca 100644 --- a/source/blender/bmesh/intern/bmesh_operators.h +++ b/source/blender/bmesh/intern/bmesh_operators.h @@ -118,7 +118,7 @@ enum { BEVEL_PROFILE_CUSTOM, }; -/* Bevel face_strength_mode values: should match face_str mode enum in DNA_modifer_types.h */ +/* Bevel face_strength_mode values: should match face_str mode enum in DNA_modifier_types.h */ enum { BEVEL_FACE_STRENGTH_NONE, BEVEL_FACE_STRENGTH_NEW, diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index 50469d57a34..d771b8f35b8 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -252,9 +252,9 @@ void flush_editors_id_update(Depsgraph *graph, const DEGEditorUpdateContext *upd deg_editors_id_update(update_ctx, id_orig); } if (ID_IS_OVERRIDE_LIBRARY(id_orig) && id_orig->recalc != 0) { - /* We only want to tag an ID for liboverride autorefresh if it was actually tagged as + /* We only want to tag an ID for lib-override auto-refresh if it was actually tagged as * changed. CoW IDs indirectly modified because of changes in other IDs should never - * require a liboverride diffing. */ + * require a lib-override diffing. */ id_orig->tag |= LIB_TAG_OVERRIDE_LIBRARY_AUTOREFRESH; } /* Inform draw engines that something was changed. */ diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index ffaeb999df7..173aa51f406 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -503,7 +503,7 @@ static void reorder_instanced_panel_list(bContext *C, ARegion *region, Panel *dr /** * Recursive implementation for #UI_panel_set_expand_from_list_data. * - * \return Whether the closed flag for the panel or any subpanels changed. + * \return Whether the closed flag for the panel or any sub-panels changed. */ static bool panel_set_expand_from_list_data_recursive(Panel *panel, short flag, short *flag_index) { @@ -523,7 +523,7 @@ static bool panel_set_expand_from_list_data_recursive(Panel *panel, short flag, } /** - * Set the expansion of the panel and its subpanels from the flag stored by the list data + * Set the expansion of the panel and its sub-panels from the flag stored by the list data * corresponding to this panel. The flag has expansion stored in each bit in depth first * order. */ @@ -594,7 +594,7 @@ static void set_panels_list_data_expand_flag(const bContext *C, ARegion *region) /****************************** panels ******************************/ /** - * Set flag state for a panel and its subpanels. + * Set flag state for a panel and its sub-panels. * * \return True if this function changed any of the flags, false if it didn't. */ @@ -1190,7 +1190,7 @@ void ui_draw_aligned_panel(uiStyle *style, /* 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 . */ + /* Draw the bottom sub-panels. */ if (draw_box_style) { if (panel->next) { immUniformThemeColor(panel_col); @@ -2061,8 +2061,8 @@ static void ui_handle_panel_header( } else { const int closed_flag = (align == BUT_HORIZONTAL) ? PNL_CLOSEDX : PNL_CLOSEDY; - /* If a panel has subpanels and it's open, toggle the expansion - * of the subpanels (based on the expansion of the first subpanel). */ + /* If a panel has sub-panels and it's open, toggle the expansion + * of the sub-panels (based on the expansion of the first subpanel). */ Panel *first_child = block->panel->children.first; BLI_assert(first_child != NULL); panel_set_flag_recursive( @@ -2955,7 +2955,7 @@ static void panel_activate_state(const bContext *C, Panel *panel, uiHandlePanelS bool was_drag_drop = (data && data->state == PANEL_STATE_DRAG); - /* Set selection state for the panel and its subpanels, which need to know they are selected + /* Set selection state for the panel and its sub-panels, which need to know they are selected * too so they can be drawn above their parent when it's dragged. */ if (state == PANEL_STATE_EXIT || state == PANEL_STATE_ANIMATION) { if (data && data->state != PANEL_STATE_ANIMATION) { diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 0d6717c8e12..d06c1a251f6 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1963,7 +1963,7 @@ static short get_constraint_expand_flag(const bContext *C, Panel *panel) } /** - * Save the expand flag for the panel and subpanels to the constraint. + * Save the expand flag for the panel and sub-panels to the constraint. */ static void set_constraint_expand_flag(const bContext *C, Panel *panel, short expand_flag) { diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 25b01a20981..d89bb91fb47 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4713,7 +4713,7 @@ static void do_clay_strips_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int t * artifacts, this displaces the test cube space in relation to the plane in order to * deform more vertices that may be below it. */ /* The 0.7 and 1.25 factors are arbitrary and don't have any relation between them, they were set - * by doing multiple tests using the defaul Clay Strips brush preset. */ + * by doing multiple tests using the default "Clay Strips" brush preset. */ float area_co_displaced[3]; madd_v3_v3v3fl(area_co_displaced, area_co, area_no, -radius * 0.7f); diff --git a/source/blender/freestyle/intern/view_map/AutoPtrHelper.h b/source/blender/freestyle/intern/view_map/AutoPtrHelper.h index 1a72fe48a2a..fb2a9d73d13 100644 --- a/source/blender/freestyle/intern/view_map/AutoPtrHelper.h +++ b/source/blender/freestyle/intern/view_map/AutoPtrHelper.h @@ -35,15 +35,15 @@ template<typename T> class AutoPtr : public std::unique_ptr<T> { { } - /* Mimmic behavior of legacy auto_ptr. - * Keep implementation as small as possible, hense delete assignment oeprator. */ + /* Mimic behavior of legacy auto_ptr. + * Keep implementation as small as possible, hens delete assignment operator. */ template<typename X> AutoPtr(AutoPtr<X> &other) : std::unique_ptr<T>(other.get()) { other.release(); } - template<typename X> AutoPtr& operator=(AutoPtr<X> & other) = delete; + template<typename X> AutoPtr &operator=(AutoPtr<X> &other) = delete; }; } /* namespace Freestyle */ diff --git a/source/blender/functions/FN_cpp_type.hh b/source/blender/functions/FN_cpp_type.hh index c6e440251ee..e44ce858b74 100644 --- a/source/blender/functions/FN_cpp_type.hh +++ b/source/blender/functions/FN_cpp_type.hh @@ -21,7 +21,7 @@ * \ingroup functions * * The CPPType class is the core of the runtime-type-system used by the functions system. An - * instance of this class can represent any C++ type, that is default-constructable, destructable, + * instance of this class can represent any C++ type, that is default-constructible, destructible, * movable and copyable. Therefore it also works for all C types. This restrictions might need to * be removed in the future, but for now every required type has these properties. * diff --git a/source/blender/functions/FN_multi_function_context.hh b/source/blender/functions/FN_multi_function_context.hh index fa7ac653553..2fb1cc94812 100644 --- a/source/blender/functions/FN_multi_function_context.hh +++ b/source/blender/functions/FN_multi_function_context.hh @@ -20,10 +20,10 @@ /** \file * \ingroup fn * - * An MFContext is passed along with every call to a multi-function. Right now it does nothing, but - * it can be used for the following purposes: + * An #MFContext is passed along with every call to a multi-function. Right now it does nothing, + * but it can be used for the following purposes: * - Pass debug information up and down the function call stack. - * - Pass reusable memory buffers to subfunctions to increase performance. + * - Pass reusable memory buffers to sub-functions to increase performance. * - Pass cached data to called functions. */ diff --git a/source/blender/functions/intern/multi_function_network_evaluation.cc b/source/blender/functions/intern/multi_function_network_evaluation.cc index 35eda4c157a..327a3a66561 100644 --- a/source/blender/functions/intern/multi_function_network_evaluation.cc +++ b/source/blender/functions/intern/multi_function_network_evaluation.cc @@ -27,7 +27,7 @@ * - It can handle all existing parameter types (including mutable parameters). * - Avoids data copies in many cases. * - Every node is executed at most once. - * - Can compute subfunctions on a single element, when the result is the same for all elements. + * - Can compute sub-functions on a single element, when the result is the same for all elements. * * Possible improvements: * - Cache and reuse buffers. diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c index 93d6dff4c16..34a9e938ac3 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c @@ -406,7 +406,7 @@ PanelType *gpencil_modifier_panel_register(ARegionType *region_type, panel_type->poll = gpencil_modifier_ui_poll; /* Give the panel the special flag that says it was built here and corresponds to a - * modifer rather than a PanelType. */ + * modifier rather than a #PanelType. */ panel_type->flag = PNL_LAYOUT_HEADER_EXPAND | PNL_DRAW_BOX | PNL_INSTANCED; panel_type->reorder = gpencil_modifier_reorder; panel_type->get_list_data_expand_flag = get_gpencil_modifier_expand_flag; @@ -457,4 +457,4 @@ PanelType *gpencil_modifier_subpanel_register(ARegionType *region_type, return panel_type; } -/** \} */
\ No newline at end of file +/** \} */ diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 3685290e571..a1cc6f89314 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -113,7 +113,7 @@ typedef struct Key { /** * Can never be 0, this is used for detecting old data. - * current free uid for keyblocks + * current free UID for key-blocks. */ int uidgen; } Key; diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h index 39d38c66d45..f19181bf07d 100644 --- a/source/blender/makesdna/DNA_shader_fx_types.h +++ b/source/blender/makesdna/DNA_shader_fx_types.h @@ -64,7 +64,7 @@ typedef struct ShaderFxData { int type, mode; int stackindex; short flag; - /* Expansion for shader effect panels and subpanels. */ + /* Expansion for shader effect panels and sub-panels. */ short ui_expand_flag; /** MAX_NAME. */ char name[64]; diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index e49186f4cb1..3ae16f8577a 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -687,7 +687,7 @@ static void rna_FModifier_start_frame_set(PointerRNA *ptr, float value) } } -static void rna_FModifer_end_frame_set(PointerRNA *ptr, float value) +static void rna_FModifier_end_frame_set(PointerRNA *ptr, float value) { FModifier *fcm = (FModifier *)ptr->data; @@ -1665,7 +1665,7 @@ static void rna_def_fmodifier(BlenderRNA *brna) prop = RNA_def_property(srna, "frame_end", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "efra"); RNA_def_property_float_funcs( - prop, NULL, "rna_FModifer_end_frame_set", "rna_FModifier_end_frame_range"); + prop, NULL, "rna_FModifier_end_frame_set", "rna_FModifier_end_frame_range"); RNA_def_property_ui_text( prop, "End Frame", diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 778518ce19a..c35b768fd01 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -1641,7 +1641,7 @@ static void rna_SimulationModifier_simulation_update(Main *bmain, Scene *scene, /** * Special set callback that just changes the first bit of the expansion flag. - * This way the expansion state of all the subpanels is not changed by RNA. + * This way the expansion state of all the sub-panels is not changed by RNA. */ static void rna_Modifier_show_expanded_set(PointerRNA *ptr, bool value) { diff --git a/source/blender/modifiers/intern/MOD_ui_common.c b/source/blender/modifiers/intern/MOD_ui_common.c index d6c9d7b3cb7..88e095c549e 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.c +++ b/source/blender/modifiers/intern/MOD_ui_common.c @@ -127,7 +127,7 @@ void modifier_panel_end(uiLayout *layout, PointerRNA *ptr) /** * Gets RNA pointers for the active object and the panel's modifier data. Also locks - * the layout if the modifer is from a linked object, and sets the context pointer. + * the layout if the modifier is from a linked object, and sets the context pointer. */ #define ERROR_LIBDATA_MESSAGE TIP_("External library data") void modifier_panel_get_property_pointers(const bContext *C, diff --git a/source/blender/shader_fx/intern/FX_ui_common.c b/source/blender/shader_fx/intern/FX_ui_common.c index e02074a92a8..3a1df937c9f 100644 --- a/source/blender/shader_fx/intern/FX_ui_common.c +++ b/source/blender/shader_fx/intern/FX_ui_common.c @@ -90,7 +90,7 @@ static short get_shaderfx_expand_flag(const bContext *C, Panel *panel) } /** - * Save the expand flag for the panel and subpanels to the effect. + * Save the expand flag for the panel and sub-panels to the effect. */ static void set_shaderfx_expand_flag(const bContext *C, Panel *panel, short expand_flag) { diff --git a/source/creator/creator.c b/source/creator/creator.c index b96b33f7a27..abf55b8d52b 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -158,7 +158,7 @@ static void callback_mem_error(const char *errorStr) static void main_callback_setup(void) { - /* Error output from the alloc routines: */ + /* Error output from the guarded allocation routines. */ MEM_set_error_callback(callback_mem_error); } @@ -208,7 +208,7 @@ static void callback_clg_fatal(void *fp) static void *evil_C = NULL; # ifdef __APPLE__ -/* environ is not available in mac shared libraries */ +/* Environment is not available in macOS shared libraries. */ # include <crt_externs.h> char **environ = NULL; # endif @@ -246,24 +246,24 @@ int main(int argc, struct CreatorAtExitData app_init_data = {NULL}; BKE_blender_atexit_register(callback_main_atexit, &app_init_data); - /* Unbuffered stdout makes stdout and stderr better synchronized, and helps + /* Un-buffered `stdout` makes `stdout` and `stderr` better synchronized, and helps * when stepping through code in a debugger (prints are immediately * visible). However disabling buffering causes lock contention on windows - * see T76767 for detais, since this is a debugging aid, we do not enable - * the unbuffered behavior for release builds. */ + * see T76767 for details, since this is a debugging aid, we do not enable + * the un-buffered behavior for release builds. */ #ifndef NDEBUG setvbuf(stdout, NULL, _IONBF, 0); #endif #ifdef WIN32 - /* We delay loading of openmp so we can set the policy here. */ + /* We delay loading of OPENMP so we can set the policy here. */ # if defined(_MSC_VER) _putenv_s("OMP_WAIT_POLICY", "PASSIVE"); # endif - /* Win32 Unicode Args */ + /* Win32 Unicode Arguments. */ /* NOTE: cannot use guardedalloc malloc here, as it's not yet initialized - * (it depends on the args passed in, which is what we're getting here!) + * (it depends on the arguments passed in, which is what we're getting here!) */ { wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(), &argc); @@ -345,7 +345,7 @@ int main(int argc, main_callback_setup(); #if defined(__APPLE__) && !defined(WITH_PYTHON_MODULE) && !defined(WITH_HEADLESS) - /* patch to ignore argument finder gives us (pid?) */ + /* Patch to ignore argument finder gives us (PID?) */ if (argc == 2 && STREQLEN(argv[1], "-psn_", 5)) { extern int GHOST_HACK_getFirstFile(char buf[]); static char firstfilebuf[512]; @@ -419,7 +419,7 @@ int main(int argc, RE_engines_init(); init_nodesystem(); psys_init_rng(); - /* end second init */ + /* End second initialization. */ #if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS) /* Python module mode ALWAYS runs in background-mode (for now). */ @@ -475,7 +475,7 @@ int main(int argc, * #WM_init() before #BPY_python_start() crashes Blender at startup. */ - /* TODO - U.pythondir */ + /* TODO: #U.pythondir */ #else printf( "\n* WARNING * - Blender compiled without Python!\n" @@ -532,7 +532,7 @@ int main(int argc, WM_main(C); return 0; -} /* end of int main(argc, argv) */ +} /* End of int main(...) function. */ #ifdef WITH_PYTHON_MODULE void main_python_exit(void) |