diff options
author | Campbell Barton <campbell@blender.org> | 2022-06-07 07:53:20 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-06-07 08:01:03 +0300 |
commit | 263371dc4e217ab38ee30fcb210e3c342c6c60ec (patch) | |
tree | 046c7c69b3b712721a96b514e52026917a4f11aa /source/blender | |
parent | 243891104fce627ced86d39e83d4e2efc1fe58e2 (diff) |
Cleanup: spelling in comments, additional white space
Diffstat (limited to 'source/blender')
32 files changed, 76 insertions, 71 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 5cf0ca6e062..8496692ceb3 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -628,14 +628,14 @@ static void mesh_calc_modifier_final_normals(const Mesh *mesh_input, /* without this, drawing ngon tri's faces will show ugly tessellated face * normals and will also have to calculate normals on the fly, try avoid * this where possible since calculating polygon normals isn't fast, - * note that this isn't a problem for subsurf (only quads) or editmode + * note that this isn't a problem for subsurf (only quads) or edit-mode * which deals with drawing differently. */ BKE_mesh_ensure_normals_for_display(mesh_final); } /* Some modifiers, like data-transfer, may generate those data as temp layer, * we do not want to keep them, as they are used by display code when available - * (i.e. even if autosmooth is disabled). */ + * (i.e. even if auto-smooth is disabled). */ if (CustomData_has_layer(&mesh_final->ldata, CD_NORMAL)) { CustomData_free_layers(&mesh_final->ldata, CD_NORMAL, mesh_final->totloop); } diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index e99230ef523..35f02c29a00 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -168,7 +168,7 @@ void IDP_ResizeIDPArray(IDProperty *prop, int newlen) /* NOTE: This code comes from python, here's the corresponding comment. */ /* This over-allocates proportional to the list size, making room - * for additional growth. The over-allocation is mild, but is + * for additional growth. The over-allocation is mild, but is * enough to give linear-time amortized behavior over a long * sequence of appends() in the presence of a poorly-performing * system realloc(). diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c index 2600a40153c..246999a1179 100644 --- a/source/blender/blenkernel/intern/lib_remap.c +++ b/source/blender/blenkernel/intern/lib_remap.c @@ -454,7 +454,7 @@ static void libblock_remap_reset_remapping_status_callback(ID *old_id, * \param old_id: the data-block to dereference (may be NULL if \a id is non-NULL). * \param new_id: the new data-block to replace \a old_id references with (may be NULL). * \param r_id_remap_data: if non-NULL, the IDRemap struct to use - * (uselful to retrieve info about remapping process). + * (useful to retrieve info about remapping process). */ ATTR_NONNULL(1) static void libblock_remap_data(Main *bmain, diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index c0eb1955fdf..12a661d139b 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -55,7 +55,7 @@ static void linestyle_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const FreestyleLineStyle *linestyle_dst = (FreestyleLineStyle *)id_dst; const FreestyleLineStyle *linestyle_src = (const FreestyleLineStyle *)id_src; - /* We never handle usercount here for own data. */ + /* We never handle user-count here for own data. */ const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT; /* We always need allocation of our private ID data. */ const int flag_private_id_data = flag & ~LIB_ID_CREATE_NO_ALLOCATE; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index bb499f24c07..1016d91614b 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -2117,7 +2117,7 @@ void BKE_sculpt_ensure_orig_mesh_data(Scene *scene, Object *object) /* Copy the current mesh visibility to the Face Sets. */ BKE_sculpt_face_sets_ensure_from_base_mesh_visibility(mesh); if (object->sculpt != NULL) { - /* If a sculpt session is active, ensure we have its faceset data porperly up-to-date. */ + /* If a sculpt session is active, ensure we have its face-set data properly up-to-date. */ object->sculpt->face_sets = CustomData_get_layer(&mesh->pdata, CD_SCULPT_FACE_SETS); /* NOTE: In theory we could add that on the fly when required by sculpt code. diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index a7ab1536b1f..3ad770c5429 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3121,7 +3121,7 @@ static void collision_check(ParticleSimulationData *sim, int p, float dfra, floa col.cfra = cfra; col.old_cfra = sim->psys->cfra; - /* get acceleration (from gravity, forcefields etc. to be re-applied in collision response) */ + /* Get acceleration (from gravity, force-fields etc. to be re-applied in collision response). */ sub_v3_v3v3(col.acc, pa->state.vel, pa->prev_state.vel); mul_v3_fl(col.acc, 1.0f / col.total_time); @@ -4962,7 +4962,7 @@ void particle_system_update(struct Depsgraph *depsgraph, } /* Save matrix for duplicators, - * at rendertime the actual dupliobject's matrix is used so don't update! */ + * at render-time the actual dupli-object's matrix is used so don't update! */ invert_m4_m4(psys->imat, ob->obmat); BKE_particle_batch_cache_dirty_tag(psys, BKE_PARTICLE_BATCH_DIRTY_ALL); diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 2467ca16670..d7bdfe08ab9 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -3232,7 +3232,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) scene, pid->calldata, &cache->startframe, &cache->endframe); } - /* XXX workaround for regression inroduced in ee3fadd, needs looking into */ + /* XXX: workaround for regression introduced in ee3fadd, needs looking into. */ if (pid->type == PTCACHE_TYPE_RIGIDBODY) { if ((cache->flag & PTCACHE_REDO_NEEDED || (cache->flag & PTCACHE_SIMULATION_VALID) == 0) && diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c index 1996273b681..fda833ffd27 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.c +++ b/source/blender/blenkernel/intern/subdiv_eval.c @@ -247,7 +247,7 @@ bool BKE_subdiv_eval_refine_from_mesh(Subdiv *subdiv, } /* Set coordinates of base mesh vertices. */ set_coarse_positions(subdiv, mesh, coarse_vertex_cos); - /* Set face-varyign data to UV maps. */ + /* Set face-varying data to UV maps. */ const int num_uv_layers = CustomData_number_of_layers(&mesh->ldata, CD_MLOOPUV); for (int layer_index = 0; layer_index < num_uv_layers; layer_index++) { const MLoopUV *mloopuv = CustomData_get_layer_n(&mesh->ldata, CD_MLOOPUV, layer_index); diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c index d86a0c10f01..e2e0b4227e3 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.c +++ b/source/blender/blenkernel/intern/tracking_stabilize.c @@ -362,7 +362,7 @@ static MovieTrackingMarker *get_tracking_data_point(StabContext *ctx, * * As a simple default, we use the weighted average of the location markers * of the current frame as pivot point. TODO: It is planned to add further - * options, like e.g. anchoring the pivot point at the canvas. Moreover, + * options, like e.g. anchoring the pivot point at the canvas. Moreover, * it is planned to allow for a user controllable offset. */ static void setup_pivot(const float ref_pos[2], float r_pivot[2]) diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index 7f90ec20b66..8743b135dff 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -562,7 +562,7 @@ bool BLI_ghashutil_ptrcmp(const void *a, const void *b); /** * This function implements the widely used `djb` hash apparently posted - * by Daniel Bernstein to `comp.lang.c` some time ago. The 32 bit + * by Daniel Bernstein to `comp.lang.c` some time ago. The 32 bit * unsigned hash value starts at 5381 and for each byte 'c' in the * string, is updated: `hash = hash * 33 + c`. * This function uses the signed value of each byte. diff --git a/source/blender/blenlib/BLI_math_color.h b/source/blender/blenlib/BLI_math_color.h index 64b820a22b0..6386a7f76f8 100644 --- a/source/blender/blenlib/BLI_math_color.h +++ b/source/blender/blenlib/BLI_math_color.h @@ -123,7 +123,7 @@ MINLINE void premul_float_to_straight_uchar(unsigned char *result, const float c * one of the primaries, it lies outside the color gamut * accessible from the given triple of primaries. Desaturate * it by adding white, equal quantities of R, G, and B, enough - * to make RGB all positive. The function returns 1 if the + * to make RGB all positive. The function returns 1 if the * components were modified, zero otherwise. */ int constrain_rgb(float *r, float *g, float *b); diff --git a/source/blender/blenlib/intern/hash_md5.c b/source/blender/blenlib/intern/hash_md5.c index 9da8c0a0941..d57f859eb1b 100644 --- a/source/blender/blenlib/intern/hash_md5.c +++ b/source/blender/blenlib/intern/hash_md5.c @@ -143,7 +143,7 @@ static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ct (void)0 /* Before we start, one word to the strange constants. They are defined in RFC 1321 as: - * T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64 + * `T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64` */ /* Round 1. */ @@ -315,7 +315,7 @@ int BLI_hash_md5_stream(FILE *stream, void *resblock) break; } - /* Process buffer with BLOCKSIZE bytes. Note that BLOCKSIZE % 64 == 0. */ + /* Process buffer with BLOCKSIZE bytes. Note that `BLOCKSIZE % 64 == 0`. */ md5_process_block(buffer, BLOCKSIZE, &ctx); } @@ -323,7 +323,7 @@ int BLI_hash_md5_stream(FILE *stream, void *resblock) * 'fillbuf' contains the needed bits. */ memcpy(&buffer[sum], fillbuf, 64); - /* Compute amount of padding bytes needed. Alignment is done to (N + PAD) % 64 == 56. + /* Compute amount of padding bytes needed. Alignment is done to `(N + PAD) % 64 == 56`. * There is always at least one byte padded, i.e. if the alignment is correctly aligned, * 64 padding bytes are added. */ diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index eeec55a7b06..eafb27f9758 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1569,8 +1569,8 @@ void do_versions_after_linking_280(Main *bmain, ReportList *UNUSED(reports)) if (!MAIN_VERSION_ATLEAST(bmain, 281, 2)) { /* Replace Multiply and Additive blend mode by Alpha Blend - * now that we use dualsource blending. */ - /* We take care of doing only nodetrees that are always part of materials + * now that we use dual-source blending. */ + /* We take care of doing only node-trees that are always part of materials * with old blending modes. */ for (Material *ma = bmain->materials.first; ma; ma = ma->id.next) { bNodeTree *ntree = ma->nodetree; diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index cd56adfe60c..a15ddc75aa2 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -1440,7 +1440,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) view_layer->eevee.render_passes &= ~EEVEE_RENDER_PASS_UNUSED_8; } - /* Rename Renderlayer Socket `VolumeScatterCol` to `VolumeDir` */ + /* Rename Render-layer Socket `VolumeScatterCol` to `VolumeDir`. */ if (scene->nodetree) { LISTBASE_FOREACH (bNode *, node, &scene->nodetree->nodes) { if (node->type == CMP_NODE_R_LAYERS) { diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index a978d6fe75e..ad218d80cdf 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -682,7 +682,7 @@ typedef struct EEVEE_GeometryMotionData { /** To disable deform mb if vertcount mismatch. */ int use_deform; - /* The batch and vbos are not owned. */ + /* The batch and VBOs are not owned. */ struct GPUBatch *batch; /* Batch for time = t. */ struct GPUVertBuf *vbo[2]; /* VBO for time = t +/- step. */ } EEVEE_GeometryMotionData; diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 07105757b2c..fa4a1d93d3e 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -837,7 +837,7 @@ void DRW_render_viewport_size_set(const int size[2]); /** * Assume a valid GL context is bound (and that the gl_context_mutex has been acquired). * This function only setup DST and execute the given function. - * \warning similar to DRW_render_to_image you cannot use default lists (dfbl & dtxl). + * \warning similar to DRW_render_to_image you cannot use default lists (`dfbl` & `dtxl`). */ void DRW_custom_pipeline(DrawEngineType *draw_engine_type, struct Depsgraph *depsgraph, @@ -850,6 +850,7 @@ void DRW_custom_pipeline(DrawEngineType *draw_engine_type, void DRW_cache_restart(void); /* ViewLayers */ + void *DRW_view_layer_engine_data_get(DrawEngineType *engine_type); void **DRW_view_layer_engine_data_ensure_ex(struct ViewLayer *view_layer, DrawEngineType *engine_type, @@ -858,6 +859,7 @@ void **DRW_view_layer_engine_data_ensure(DrawEngineType *engine_type, void (*callback)(void *storage)); /* DrawData */ + DrawData *DRW_drawdata_get(ID *id, DrawEngineType *engine_type); DrawData *DRW_drawdata_ensure(ID *id, DrawEngineType *engine_type, diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index c2d517588b2..9eeabf2d05e 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -4351,15 +4351,15 @@ void ANIM_channel_setting_set(bAnimContext *ac, /* --------------------------- */ -/* size of icons */ +/** Size of icons. */ #define ICON_WIDTH (0.85f * U.widget_unit) -/* width of sliders */ +/** Width of sliders. */ #define SLIDER_WIDTH (4 * U.widget_unit) -/* min-width of rename textboxes */ +/** Min-width of rename text-boxes. */ #define RENAME_TEXT_MIN_WIDTH (U.widget_unit) -/* width of graph editor color bands */ +/** Width of graph editor color bands. */ #define GRAPH_COLOR_BAND_WIDTH (0.3f * U.widget_unit) -/* extra offset for the visibility icons in the graph editor */ +/** Extra offset for the visibility icons in the graph editor. */ #define GRAPH_ICON_VISIBILITY_OFFSET (GRAPH_COLOR_BAND_WIDTH * 1.5f) /* Helper - Check if a channel needs renaming */ diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index 1b759f5dfa2..c6f68228807 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -180,7 +180,7 @@ static int add_driver_with_target(ReportList *UNUSED(reports), } else if ((RNA_property_unit(src_prop) == PROP_UNIT_ROTATION) && (RNA_property_unit(dst_prop) != PROP_UNIT_ROTATION)) { - /* Rotation Source: radians -> normal, so convert src to degrees + /* Rotation Source: radians -> normal, so convert src to degrees * (However, if both input and output is a rotation, don't apply such corrections) */ BLI_strncpy(driver->expression, "degrees(var)", sizeof(driver->expression)); diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index b045d908438..5bd20b7be98 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -113,7 +113,7 @@ typedef enum eGPUTextureFormat { GPU_R16F, GPU_R16, /* Max texture buffer format. */ - /* Special formats texture & renderbuffer */ + /* Special formats texture & render-buffer. */ GPU_RGB10_A2, GPU_R11F_G11F_B10F, GPU_DEPTH32F_STENCIL8, diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index a2459023e8e..1b32bef0a98 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -41,8 +41,7 @@ typedef struct DDSData { /** * \ingroup imbuf - * This is the abstraction of an image. ImBuf is the basic type used for all - * imbuf operations. + * This is the abstraction of an image. ImBuf is the basic type used for all imbuf operations. * * Also; add new variables to the end to save pain! */ diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h index 6e505746643..9a0a6998fab 100644 --- a/source/blender/imbuf/intern/IMB_filetype.h +++ b/source/blender/imbuf/intern/IMB_filetype.h @@ -240,11 +240,10 @@ void imb_loadtiletiff( /** * Saves a TIFF file. * - * #ImBuf structures with 1, 3 or 4 bytes per pixel (GRAY, RGB, RGBA - * respectively) are accepted, and interpreted correctly. Note that the TIFF - * convention is to use pre-multiplied alpha, which can be achieved within - * Blender by setting "Premul" alpha handling. Other alpha conventions are - * not strictly correct, but are permitted anyhow. + * #ImBuf structures with 1, 3 or 4 bytes per pixel (GRAY, RGB, RGBA respectively) + * are accepted, and interpreted correctly. Note that the TIFF convention is to use + * pre-multiplied alpha, which can be achieved within Blender by setting `premul` alpha handling. + * Other alpha conventions are not strictly correct, but are permitted anyhow. * * \param ibuf: Image buffer. * \param filepath: Name of the TIFF file to create. diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index 1372aa31713..2f13ef409e3 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -8,15 +8,15 @@ * Provides TIFF file loading and saving for Blender, via libtiff. * * The task of loading is complicated somewhat by the fact that Blender has - * already loaded the file into a memory buffer. libtiff is not well + * already loaded the file into a memory buffer. libtiff is not well * configured to handle files in memory, so a client wrapper is written to - * surround the memory and turn it into a virtual file. Currently, reading - * of TIFF files is done using libtiff's RGBAImage support. This is a + * surround the memory and turn it into a virtual file. Currently, reading + * of TIFF files is done using libtiff's RGBAImage support. This is a * high-level routine that loads all images as 32-bit RGBA, handling all the * required conversions between many different TIFF types internally. * * Saving supports RGB, RGBA and BW (gray-scale) images correctly, with - * 8 bits per channel in all cases. The "deflate" compression algorithm is + * 8 bits per channel in all cases. The "deflate" compression algorithm is * used to compress images. */ @@ -151,8 +151,8 @@ static tsize_t imb_tiff_ReadProc(thandle_t handle, tdata_t data, tsize_t n) /** * Writes data to an in-memory TIFF file. * - * NOTE: The current Blender implementation should not need this function. It - * is simply a stub. + * NOTE: The current Blender implementation should not need this function. + * It is simply a stub. */ static tsize_t imb_tiff_WriteProc(thandle_t handle, tdata_t data, tsize_t n) { @@ -176,7 +176,7 @@ static tsize_t imb_tiff_WriteProc(thandle_t handle, tdata_t data, tsize_t n) * error). * * \return Resulting offset location within the file, measured in bytes from - * the beginning of the file. (-1) indicates an error. + * the beginning of the file. (-1) indicates an error. */ static toff_t imb_tiff_SeekProc(thandle_t handle, toff_t ofs, int whence) { @@ -215,8 +215,8 @@ static toff_t imb_tiff_SeekProc(thandle_t handle, toff_t ofs, int whence) * Closes (virtually) an in-memory TIFF file. * * NOTE: All this function actually does is sets the data pointer within the - * TIFF file to NULL. That should trigger assertion errors if attempts - * are made to access the file after that point. However, no such + * TIFF file to NULL. That should trigger assertion errors if attempts + * are made to access the file after that point. However, no such * attempts should ever be made (in theory). * * \param handle: Handle of the TIFF file (pointer to #ImbTIFFMemFile). @@ -734,7 +734,7 @@ bool imb_savetiff(ImBuf *ibuf, const char *filepath, int flags) int x, y, from_i, to_i, i; int compress_mode = COMPRESSION_NONE; - /* check for a valid number of bytes per pixel. Like the PNG writer, + /* check for a valid number of bytes per pixel. Like the PNG writer, * the TIFF writer supports 1, 3 or 4 bytes per pixel, corresponding * to gray, RGB, RGBA respectively. */ samplesperpixel = (uint16_t)((ibuf->planes + 7) >> 3); @@ -838,7 +838,7 @@ bool imb_savetiff(ImBuf *ibuf, const char *filepath, int flags) TIFFSetField(image, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); } - /* copy pixel data. While copying, we flip the image vertically. */ + /* copy pixel data. While copying, we flip the image vertically. */ const int channels_in_float = ibuf->channels ? ibuf->channels : 4; for (x = 0; x < ibuf->x; x++) { for (y = 0; y < ibuf->y; y++) { diff --git a/source/blender/io/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h index 85f960abfe6..416b5728b66 100644 --- a/source/blender/io/collada/MeshImporter.h +++ b/source/blender/io/collada/MeshImporter.h @@ -72,7 +72,7 @@ class MeshImporter : public MeshImporterBase { std::map<std::string, std::string> mesh_geom_map; /* needed for correct shape key naming */ std::map<COLLADAFW::UniqueId, Mesh *> uid_mesh_map; /* geometry unique id-to-mesh map */ - std::map<COLLADAFW::UniqueId, Object *> uid_object_map; /* geom uid-to-object */ + std::map<COLLADAFW::UniqueId, Object *> uid_object_map; /* geom UID-to-object */ std::vector<Object *> imported_objects; /* list of imported objects */ /* this structure is used to assign material indices to polygons @@ -86,7 +86,7 @@ class MeshImporter : public MeshImporterBase { /* crazy name! */ std::map<COLLADAFW::UniqueId, MaterialIdPrimitiveArrayMap> geom_uid_mat_mapping_map; /* < materials that have already been mapped to a geometry. - * A pair/of geom uid and mat uid, one geometry can have several materials */ + * A pair/of geom UID and mat UID, one geometry can have several materials. */ std::multimap<COLLADAFW::UniqueId, COLLADAFW::UniqueId> materials_mapped_to_geom; bool set_poly_indices( diff --git a/source/blender/io/stl/importer/stl_import_ascii_reader.hh b/source/blender/io/stl/importer/stl_import_ascii_reader.hh index b0216d98496..e8aed911bf1 100644 --- a/source/blender/io/stl/importer/stl_import_ascii_reader.hh +++ b/source/blender/io/stl/importer/stl_import_ascii_reader.hh @@ -12,17 +12,20 @@ #include "stl_import.hh" -/* ASCII STL spec.: - * solid name - * facet normal ni nj nk - * outer loop - * vertex v1x v1y v1z - * vertex v2x v2y v2z - * vertex v3x v3y v3z - * endloop - * endfacet - * ... - * endsolid name +/** + * ASCII STL spec: + * <pre> + * solid name + * facet normal ni nj nk + * outer loop + * vertex v1x v1y v1z + * vertex v2x v2y v2z + * vertex v3x v3y v3z + * endloop + * endfacet + * ... + * endsolid name + * </pre> */ namespace blender::io::stl { diff --git a/source/blender/io/usd/tests/usd_tests_common.h b/source/blender/io/usd/tests/usd_tests_common.h index 7f6ae558354..949348da959 100644 --- a/source/blender/io/usd/tests/usd_tests_common.h +++ b/source/blender/io/usd/tests/usd_tests_common.h @@ -12,7 +12,7 @@ namespace blender::io::usd { * Thus function must be called before instantiating a USD * stage to avoid errors. The returned string is the path to * the USD data files directory from which the plugins were - * loaded. If the USD data files directory can't be determined, + * loaded. If the USD data files directory can't be determined, * plugin registration is skipped and the empty string is * returned. */ std::string register_usd_plugins_for_tests(); diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index e79a53704c9..8ac899df701 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -20,8 +20,8 @@ extern "C" { * Mass-Spring Model to Describe Rigid Cloth Behavior by Xavier Provot. * * I've tried to keep similar, if not exact names for the variables as - * are presented in the paper. Where I've changed the concept slightly, - * as in stepsPerFrame compared to the time step in the paper, I've used + * are presented in the paper. Where I've changed the concept slightly, + * as in `stepsPerFrame` compared to the time step in the paper, I've used * variables with different names to minimize confusion. */ diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index f257833efe8..698fbe8ee8f 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -374,7 +374,7 @@ typedef struct Object { /** Dupliface scale. */ float instance_faces_scale; - /** Custom index, for renderpasses. */ + /** Custom index, for render-passes. */ short index; /** Current deformation group, NOTE: index starts at 1. */ unsigned short actdef DNA_DEPRECATED; diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 02aa5254e55..77915702ee4 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -464,7 +464,7 @@ static Mesh *arrayModifier_doArray(ArrayModifierData *amd, copy_m4_m4(offset, result_mat); } - /* Check if there is some scaling. If scaling, then we will not translate mapping */ + /* Check if there is some scaling. If scaling, then we will not translate mapping */ mat4_to_size(scale, offset); offset_has_scale = !is_one_v3(scale); diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h index 39820603c98..548e38d3ef3 100644 --- a/source/blender/render/RE_pipeline.h +++ b/source/blender/render/RE_pipeline.h @@ -74,10 +74,12 @@ typedef struct RenderPass { int pad; } RenderPass; -/* a renderlayer is a full image, but with all passes and samples */ -/* size of the rects is defined in RenderResult */ -/* after render, the Combined pass is in combined, - * for renderlayers read from files it is a real pass */ +/** + * - A render-layer is a full image, but with all passes and samples. + * - The size of the rects is defined in #RenderResult. + * - After render, the Combined pass is in combined, + * for render-layers read from files it is a real pass. + */ typedef struct RenderLayer { struct RenderLayer *next, *prev; diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index b7066178abd..fc992ef069d 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -383,7 +383,7 @@ void WM_cursor_time(wmWindow *win, int nr) /** * Because defining a cursor mixes declarations and executable code * each cursor needs its own scoping block or it would be split up - * over several hundred lines of code. To enforce/document this better + * over several hundred lines of code. To enforce/document this better * I define 2 pretty brain-dead macros so it's obvious what the extra "[]" * are for */ diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index dbce360cb61..330231f3f18 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -380,7 +380,7 @@ static void free_openrecent(void) } #ifdef WIN32 -/* Read console events until there is a key event. Also returns on any error. */ +/* Read console events until there is a key event. Also returns on any error. */ static void wait_for_console_key(void) { HANDLE hConsoleInput = GetStdHandle(STD_INPUT_HANDLE); diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 95879829d42..7cd54a7e191 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -673,7 +673,7 @@ static void build_pict_list_ex( * * If set, all reads and writes on the resulting file descriptor will * be performed directly to or from the user program buffer, provided - * appropriate size and alignment restrictions are met. Refer to the + * appropriate size and alignment restrictions are met. Refer to the * F_SETFL and F_DIOINFO commands in the fcntl(2) manual entry for * information about how to determine the alignment constraints. * O_DIRECT is a Silicon Graphics extension and is only supported on |