diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/sculpt_paint/curves_sculpt_add.cc | 2 | ||||
| -rw-r--r-- | source/blender/geometry/GEO_resample_curves.hh | 2 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_shader.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_texture.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/opengl/gl_texture.hh | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/jpeg.c | 8 |
6 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index 18bdbb88d8f..feda57fff1f 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -234,7 +234,7 @@ struct AddOperationExecutor { neighbors_per_curve = this->find_curve_neighbors(added_points); } - /* Resize to add the new curves, building the offests in the array owned by thge curves. */ + /* Resize to add the new curves, building the offsets in the array owned by the curves. */ const int tot_added_curves = added_points.bary_coords.size(); curves_->resize(curves_->points_num(), curves_->curves_num() + tot_added_curves); if (interpolate_point_count_) { diff --git a/source/blender/geometry/GEO_resample_curves.hh b/source/blender/geometry/GEO_resample_curves.hh index 7cfb5dadde6..97399ccb0a5 100644 --- a/source/blender/geometry/GEO_resample_curves.hh +++ b/source/blender/geometry/GEO_resample_curves.hh @@ -15,7 +15,7 @@ namespace blender::geometry { * samples defined by the count field. Interpolate attributes to the result, with an accuracy that * depends on the curve's resolution parameter. * - * \note The values provided by the #count_field are clampled to 1 or greater. + * \note The values provided by the #count_field are clamped to 1 or greater. */ Curves *resample_to_count(const CurveComponent &src_component, const fn::Field<bool> &selection_field, diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index 72a36ebfac4..3460d33fe68 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -282,7 +282,7 @@ typedef enum eGPUBuiltinShader { /** * Draw a texture in 3D. Take a 3D position and a 2D texture coordinate for each vertex. * - * Exposed via pyapi for add-ons. + * Exposed via Python-API for add-ons. * * \param image: uniform sampler2D * \param texCoord: in vec2 diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index 474205ce8c3..b045d908438 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -282,7 +282,7 @@ void *GPU_texture_read(GPUTexture *tex, eGPUDataFormat data_format, int miplvl); * \warning Only work for 2D texture for now. * \warning Only clears the MIP 0 of the texture. * \param data_format: data format of the pixel data. - * \note The format is float for uniform textures. + * \note The format is float for UNORM textures. * \param data: 1 pixel worth of data to fill the texture with. */ void GPU_texture_clear(GPUTexture *tex, eGPUDataFormat data_format, const void *data); diff --git a/source/blender/gpu/opengl/gl_texture.hh b/source/blender/gpu/opengl/gl_texture.hh index 2dde8d6c86b..e5b879f1f15 100644 --- a/source/blender/gpu/opengl/gl_texture.hh +++ b/source/blender/gpu/opengl/gl_texture.hh @@ -363,7 +363,7 @@ inline GLenum to_gl_data_format(eGPUTextureFormat format) } /** - * Assume Unorm / Float target. Used with #glReadPixels. + * Assume UNORM/Float target. Used with #glReadPixels. */ inline GLenum channel_len_to_gl(int channel_len) { diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 80fcceb0aa7..cffa61977f7 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -286,8 +286,8 @@ static ImBuf *ibJpegImageFromCinfo(struct jpeg_decompress_struct *cinfo, } if (max_size > 0) { - /* libjpeg can more quickly decompress while scaling down to 1/2, 1/4, 1/8, - * while libjpeg-turbo can also do 3/8, 5/8, etc. But max is 1/8. */ + /* `libjpeg` can more quickly decompress while scaling down to 1/2, 1/4, 1/8, + * while `libjpeg-turbo` can also do 3/8, 5/8, etc. But max is 1/8. */ float scale = (float)max_size / MAX2(cinfo->image_width, cinfo->image_height); cinfo->scale_denom = 8; cinfo->scale_num = max_uu(1, min_uu(8, ceill(scale * (float)cinfo->scale_denom))); @@ -520,9 +520,9 @@ struct ImBuf *imb_thumbnail_jpeg(const char *filepath, if ((fgetc(infile) == JPEG_MARKER_MSB) && (fgetc(infile) == JPEG_MARKER_SOI) && (fgetc(infile) == JPEG_MARKER_MSB) && (fgetc(infile) == JPEG_MARKER_APP1)) { - /* This is a JPEG in Exif format (SOI + APP1), not JFIF (SOI + APP0). */ + /* This is a JPEG in EXIF format (SOI + APP1), not JFIF (SOI + APP0). */ unsigned int i = JPEG_APP1_MAX; - /* All Exif data is within this 64K header segment. Skip ahead until next SOI for thumbnail. */ + /* All EXIF data is within this 64K header segment. Skip ahead until next SOI for thumbnail. */ while (!((fgetc(infile) == JPEG_MARKER_MSB) && (fgetc(infile) == JPEG_MARKER_SOI)) && !feof(infile) && i--) ; |