[Bf-blender-cvs] [6089a96be29] master: Cleanup: spelling, code-blocks
Campbell Barton
noreply at git.blender.org
Wed Aug 3 23:55:32 CEST 2022
Commit: 6089a96be2993d0808018cdf209db3691a1f2d0f
Author: Campbell Barton
Date: Thu Aug 4 07:54:29 2022 +1000
Branches: master
https://developer.blender.org/rB6089a96be2993d0808018cdf209db3691a1f2d0f
Cleanup: spelling, code-blocks
===================================================================
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/BKE_lib_override.h
M source/blender/blenkernel/intern/image.cc
M source/blender/blenloader/intern/versioning_290.c
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/blender/draw/engines/eevee_next/eevee_depth_of_field.hh
M source/blender/draw/engines/eevee_next/eevee_film.hh
M source/blender/draw/engines/eevee_next/shaders/infos/eevee_depth_of_field_info.hh
M source/blender/draw/intern/DRW_render.h
M source/blender/editors/interface/interface_panel.cc
M source/blender/editors/interface/interface_region_search.cc
M source/blender/editors/interface/interface_region_tooltip.cc
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/makesdna/DNA_ID.h
M source/blender/makesrna/intern/rna_path.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index e3c249e56f9..8512992282f 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -423,7 +423,7 @@ int BKE_image_get_tile_from_pos(struct Image *ima,
void BKE_image_get_tile_uv(const struct Image *ima, const int tile_number, float r_uv[2]);
/**
- * Return the tile_number for the closest UDIM tile.
+ * Return the tile_number for the closest UDIM tile to `co`.
*/
int BKE_image_find_nearest_tile_with_offset(const struct Image *image,
const float co[2],
diff --git a/source/blender/blenkernel/BKE_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h
index 9ad5a32e6f0..f933946164c 100644
--- a/source/blender/blenkernel/BKE_lib_override.h
+++ b/source/blender/blenkernel/BKE_lib_override.h
@@ -60,7 +60,7 @@ void BKE_lib_override_library_clear(struct IDOverrideLibrary *override, bool do_
void BKE_lib_override_library_free(struct IDOverrideLibrary **override, bool do_id_user);
/**
- * Return the actual #IDOverrideLibrary data 'controlling' the given `id`, and the acutal ID owning
+ * Return the actual #IDOverrideLibrary data 'controlling' the given `id`, and the actual ID owning
* it.
*
* \note This is especially useful when `id` is a non-real override (e.g. embedded ID like a master
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index 8af696b0088..4ce413d3705 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -863,17 +863,17 @@ void BKE_image_get_tile_uv(const Image *ima, const int tile_number, float r_uv[2
}
}
-/* Linear distance between #x and the unit interval. */
+/** Linear distance between #x and the unit interval. */
static float distance_to_unit_interval(float x)
{
/* The unit interval is between 0 and 1.
- Within the interval, return 0.
- Outside the interval, return the distance to the nearest boundary.
- Intuitively, the function looks like:
- \ | | /
- __\|___|/__
- 0 1
- */
+ * Within the interval, return 0.
+ * Outside the interval, return the distance to the nearest boundary.
+ * Intuitively, the function looks like:
+ * \ | | /
+ * __\|___|/__
+ * 0 1
+ */
if (x <= 0.0f) {
return -x; /* Distance to left border. */
@@ -884,7 +884,7 @@ static float distance_to_unit_interval(float x)
return x - 1.0f; /* Distance to right border. */
}
-/* Distance squared between #co and the unit square with lower-left starting at #udim. */
+/** Distance squared between #co and the unit square with lower-left starting at #udim. */
static float distance_squared_to_udim(const float co[2], const float udim[2])
{
float delta[2];
@@ -908,12 +908,12 @@ static bool nearest_udim_tile_tie_break(const float best_dist_sq,
return (dist_sq < best_dist_sq); /* Closer than previous candidate? */
}
-/* Finds the nearest tile and offset to #co.
- * If the co-ordinates are integers, take special care to break ties. */
int BKE_image_find_nearest_tile_with_offset(const Image *image,
const float co[2],
float r_uv_offset[2])
{
+ /* NOTE: If the co-ordinates are integers, take special care to break ties. */
+
zero_v2(r_uv_offset);
int tile_number_best = -1;
@@ -962,7 +962,7 @@ static void image_init_color_management(Image *ima)
BKE_image_user_file_path(nullptr, ima, name);
- /* will set input color space to image format default's */
+ /* Will set input color space to image format default's. */
ibuf = IMB_loadiffname(name, IB_test | IB_alphamode_detect, ima->colorspace_settings.name);
if (ibuf) {
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 9ab744337a8..ff72bfe95b8 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -1697,7 +1697,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
- /* Add subpanels for FModifiers, which requires a field to store expansion. */
+ /* Add sub-panels for FModifiers, which requires a field to store expansion. */
if (!DNA_struct_elem_find(fd->filesdna, "FModifier", "short", "ui_expand_flag")) {
LISTBASE_FOREACH (bAction *, act, &bmain->actions) {
LISTBASE_FOREACH (FCurve *, fcu, &act->curves) {
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index c508bee3218..cc742b98866 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -228,7 +228,7 @@ void depsgraph_tag_to_component_opcode(const ID *id,
case ID_RECALC_PROVISION_30:
case ID_RECALC_PROVISION_31:
/* Silently ignore.
- * The bits might be passed here from ID_RECALC_ALL. This is not a codmistake, but just the
+ * The bits might be passed here from ID_RECALC_ALL. This is not a code-mistake, but just the
* way how the recalc flags are handled. */
break;
}
diff --git a/source/blender/draw/engines/eevee_next/eevee_depth_of_field.hh b/source/blender/draw/engines/eevee_next/eevee_depth_of_field.hh
index 12d9e7ebd9f..8d62e0c0784 100644
--- a/source/blender/draw/engines/eevee_next/eevee_depth_of_field.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_depth_of_field.hh
@@ -122,7 +122,7 @@ class DepthOfField {
/** Scene settings that are immutable. */
float user_overblur_;
float fx_max_coc_;
- /** Use Hiqh Quality (expensive) in-focus gather pass. */
+ /** Use High Quality (expensive) in-focus gather pass. */
bool do_hq_slight_focus_;
/** Use jittered depth of field where we randomize camera location. */
bool do_jitter_;
@@ -180,4 +180,4 @@ class DepthOfField {
/** \} */
-} // namespace blender::eevee
\ No newline at end of file
+} // namespace blender::eevee
diff --git a/source/blender/draw/engines/eevee_next/eevee_film.hh b/source/blender/draw/engines/eevee_next/eevee_film.hh
index e1ace9a40a8..3e368782d31 100644
--- a/source/blender/draw/engines/eevee_next/eevee_film.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_film.hh
@@ -40,7 +40,7 @@ class Film {
private:
Instance &inst_;
- /** Incoming combined buffer with post fx applied (motion blur + depth of field). */
+ /** Incoming combined buffer with post FX applied (motion blur + depth of field). */
GPUTexture *combined_final_tx_ = nullptr;
/** Main accumulation textures containing every render-pass except depth and combined. */
diff --git a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_depth_of_field_info.hh b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_depth_of_field_info.hh
index 42a8c78a51d..75436940ef2 100644
--- a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_depth_of_field_info.hh
+++ b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_depth_of_field_info.hh
@@ -117,7 +117,7 @@ GPU_SHADER_CREATE_INFO(eevee_depth_of_field_no_lut)
.define("DOF_BOKEH_TEXTURE", "false")
/**
* WORKAROUND(@fclem): This is to keep the code as is for now. The bokeh_lut_tx is referenced
- * even if not used after optimisation. But we don't want to include it in the create infos.
+ * even if not used after optimization. But we don't want to include it in the create infos.
*/
.define("bokeh_lut_tx", "color_tx");
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 2b2288f23cd..a3097251d35 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -795,7 +795,7 @@ bool DRW_culling_box_test(const DRWView *view, const BoundBox *bbox);
bool DRW_culling_plane_test(const DRWView *view, const float plane[4]);
/**
* Return True if the given box intersect the current view frustum.
- * This function will have to be replaced when world space bb per objects is implemented.
+ * This function will have to be replaced when world space bounding-box per objects is implemented.
*/
bool DRW_culling_min_max_test(const DRWView *view, float obmat[4][4], float min[3], float max[3]);
diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc
index 9199e6d052d..dc6a0fecb73 100644
--- a/source/blender/editors/interface/interface_panel.cc
+++ b/source/blender/editors/interface/interface_panel.cc
@@ -1090,7 +1090,7 @@ static void panel_draw_aligned_widgets(const uiStyle *style,
const int header_height = BLI_rcti_size_y(header_rect);
const int scaled_unit = round_fl_to_int(UI_UNIT_X / aspect);
- /* Offset triangle and text to the right for subpanels. */
+ /* Offset triangle and text to the right for sub-panels. */
rcti widget_rect;
widget_rect.xmin = header_rect->xmin + (is_subpanel ? scaled_unit * 0.7f : 0);
widget_rect.xmax = header_rect->xmax;
@@ -2092,7 +2092,7 @@ static void ui_handle_panel_header(const bContext *C,
ui_panel_drag_collapse_handler_add(C, UI_panel_is_closed(panel));
}
- /* Set panel custom data (modifier) active when expanding subpanels, but not top-level
+ /* Set panel custom data (modifier) active when expanding sub-panels, but not top-level
* panels to allow collapsing and expanding without setting the active element. */
if (is_subpanel) {
panel_custom_data_active_set(panel);
diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc
index f04229609f9..6bb47666afd 100644
--- a/source/blender/editors/interface/interface_region_search.cc
+++ b/source/blender/editors/interface/interface_region_search.cc
@@ -710,18 +710,18 @@ static ARegion *ui_searchbox_create_generic_ex(bContext *C,
type.regionid = RGN_TYPE_TEMPORARY;
region->type = &type;
- /* create searchbox data */
+ /* Create search-box data. */
uiSearchboxData *data = MEM_cnew<uiSearchboxData>(__func__);
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list