[Bf-blender-cvs] [c03650073e6] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Tue Feb 16 11:17:18 CET 2021
Commit: c03650073e60194500e13dc996168c4930970f5b
Author: Campbell Barton
Date: Tue Feb 16 21:15:45 2021 +1100
Branches: master
https://developer.blender.org/rBc03650073e60194500e13dc996168c4930970f5b
Cleanup: spelling
===================================================================
M intern/cycles/kernel/closure/bsdf_microfacet.h
M intern/cycles/kernel/kernel_subsurface.h
M intern/cycles/util/util_string.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
M release/scripts/startup/bl_operators/userpref.py
M source/blender/blenkernel/intern/geometry_set.cc
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/draw/engines/eevee/eevee_depth_of_field.c
M source/blender/draw/engines/eevee/eevee_effects.c
M source/blender/draw/engines/eevee/eevee_temporal_sampling.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/armature/armature_edit.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/nodes/geometry/nodes/node_geo_point_separate.cc
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index 32639ba24ec..aed4b849aca 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -487,11 +487,11 @@ ccl_device float3 bsdf_microfacet_ggx_eval_reflect(const ShaderClosure *sc,
float3 out = F * G * common;
/* eq. 2 in distribution of visible normals sampling
- * pm = Dw = G1o * dot(m, I) * D / dot(N, I); */
+ * `pm = Dw = G1o * dot(m, I) * D / dot(N, I);` */
/* eq. 38 - but see also:
* eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
- * pdf = pm * 0.25 / dot(m, I); */
+ * `pdf = pm * 0.25 / dot(m, I);` */
*pdf = G1o * common;
return out;
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 50a232dd82e..d8258a8336c 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -390,8 +390,8 @@ ccl_device_forceinline float eval_phase_dwivedi(float v, float phase_log, float
ccl_device_forceinline float sample_phase_dwivedi(float v, float phase_log, float rand)
{
- /* Based on Eq. 10 from [2]: v - (v + 1) * pow((v - 1) / (v + 1), rand)
- * Since we're already precomputing phase_log = log((v + 1) / (v - 1)) for the evaluation,
+ /* Based on Eq. 10 from [2]: `v - (v + 1) * pow((v - 1) / (v + 1), rand)`
+ * Since we're already pre-computing `phase_log = log((v + 1) / (v - 1))` for the evaluation,
* we can implement the power function like this. */
return v - (v + 1) * expf(-rand * phase_log);
}
@@ -455,7 +455,7 @@ ccl_device_noinline
float3 sigma_s = sigma_t * alpha;
/* Theoretically it should be better to use the exact alpha for the channel we're sampling at
- * each bounce, but in practise there doesn't seem to be a noticeable difference in exchange
+ * each bounce, but in practice there doesn't seem to be a noticeable difference in exchange
* for making the code significantly more complex and slower (if direction sampling depends on
* the sampled channel, we need to compute its PDF per-channel and consider it for MIS later on).
*
diff --git a/intern/cycles/util/util_string.h b/intern/cycles/util/util_string.h
index 6b6f493bd94..f2272819b2f 100644
--- a/intern/cycles/util/util_string.h
+++ b/intern/cycles/util/util_string.h
@@ -52,7 +52,7 @@ string string_remove_trademark(const string &s);
string string_from_bool(const bool var);
string to_string(const char *str);
-/* Wide char strings are only used on Windows to deal with non-ascii
+/* Wide char strings are only used on Windows to deal with non-ASCII
* characters in file names and such. No reason to use such strings
* for something else at this moment.
*
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index d7dbfbe8813..f42d4af109a 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1286,7 +1286,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
return GHOST_kFailure;
}
- /* Then get Alpha values by getting the RGBA image (that is premultiplied btw) */
+ /* Then get Alpha values by getting the RGBA image (that is pre-multiplied BTW) */
blBitmapFormatImageRGBA = [[NSBitmapImageRep alloc]
initWithBitmapDataPlanes:NULL
pixelsWide:imgSize.width
diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py
index 7c51d49d8e7..7547184dc04 100644
--- a/release/scripts/startup/bl_operators/userpref.py
+++ b/release/scripts/startup/bl_operators/userpref.py
@@ -18,8 +18,6 @@
# <pep8 compliant>
-# TODO, use PREFERENCES_OT_* prefix for operators.
-
import bpy
from bpy.types import (
Operator,
@@ -899,7 +897,6 @@ class PREFERENCES_OT_app_template_install(Operator):
traceback.print_exc()
return {'CANCELLED'}
- # _module_extract_prepare(file_to_extract)
file_to_extract_root = _zipfile_root_namelist(file_to_extract)
if self.overwrite:
for f in file_to_extract_root:
diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc
index 0bc248299ca..e6ecb6e5821 100644
--- a/source/blender/blenkernel/intern/geometry_set.cc
+++ b/source/blender/blenkernel/intern/geometry_set.cc
@@ -612,7 +612,7 @@ static GeometrySet object_get_geometry_set_for_read(const Object &object)
}
}
- /* TODO: Cover the case of pointclouds without modifiers-- they may not be covered by the
+ /* TODO: Cover the case of point-clouds without modifiers-- they may not be covered by the
* #geometry_set_eval case above. */
/* TODO: Add volume support. */
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 198f65b9794..52efeb1e822 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -330,7 +330,7 @@ static void blo_update_defaults_scene(Main *bmain, Scene *scene)
/* Enable Soft Shadows by default. */
scene->eevee.flag |= SCE_EEVEE_SHADOW_SOFT;
- /* Be sure curfalloff and primitive are initializated */
+ /* Be sure `curfalloff` and primitive are initialized. */
ToolSettings *ts = scene->toolsettings;
if (ts->gp_sculpt.cur_falloff == NULL) {
ts->gp_sculpt.cur_falloff = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index bd6c6242f86..91214f6c437 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -23,7 +23,7 @@
*
* There are 2 methods to achieve this effect.
* - The first uses projection matrix offsetting and sample accumulation to give reference quality
- * depth of field. But this needs many samples to hide the undersampling.
+ * depth of field. But this needs many samples to hide the under-sampling.
* - The second one is a post-processing based one. It follows the implementation described in
* the presentation "Life of a Bokeh - Siggraph 2018" from Guillaume Abadie. There are some
* difference with our actual implementation that prioritize quality.
@@ -139,7 +139,7 @@ bool EEVEE_depth_of_field_jitter_get(EEVEE_EffectsInfo *fx,
r_jitter[1] = (float)ring_sample / ring_sample_count;
{
- /* Bokeh shape parametrisation */
+ /* Bokeh shape parameterization. */
float r = r_jitter[0];
float T = r_jitter[1] * 2.0f * M_PI;
@@ -388,7 +388,7 @@ static void dof_bokeh_pass_init(EEVEE_FramebufferList *fbl,
}
/**
- * Ouputs halfResColorBuffer and halfResCocBuffer.
+ * Outputs halfResColorBuffer and halfResCocBuffer.
**/
static void dof_setup_pass_init(EEVEE_FramebufferList *fbl,
EEVEE_PassList *psl,
@@ -422,7 +422,7 @@ static void dof_setup_pass_init(EEVEE_FramebufferList *fbl,
}
/**
- * Ouputs min & max coc in each 8x8 half res pixel tiles (so 1/16th of fullres).
+ * Outputs min & max COC in each 8x8 half res pixel tiles (so 1/16th of full resolution).
**/
static void dof_flatten_tiles_pass_init(EEVEE_FramebufferList *fbl,
EEVEE_PassList *psl,
@@ -453,7 +453,7 @@ static void dof_flatten_tiles_pass_init(EEVEE_FramebufferList *fbl,
}
/**
- * Dilates the min & max cocs to cover maximum coc values.
+ * Dilates the min & max COCS to cover maximum COC values.
* Output format/dimensions should be the same as coc_flatten_pass as they are swapped for
* doing multiple dilation passes.
**/
@@ -536,7 +536,7 @@ static void dof_dilate_tiles_pass_draw(EEVEE_FramebufferList *fbl,
}
/**
- * Create mipmaped color & coc textures for gather passes.
+ * Create mipmaped color & COC textures for gather passes.
**/
static void dof_reduce_pass_init(EEVEE_FramebufferList *fbl,
EEVEE_PassList *psl,
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c
index 77586f4b43a..18d3e453c5d 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -517,7 +517,7 @@ void EEVEE_draw_effects(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
DRW_viewport_request_redraw();
}
- /* Record pers matrix for the next frame. */
+ /* Record perspective matrix for the next frame. */
DRW_view_persmat_get(effects->taa_view, effects->prev_persmat, false);
/* Update double buffer status if render mode. */
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 8fa7d899b6b..226d98cc50d 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -173,14 +173,14 @@ void EEVEE_temporal_sampling_matrices_calc(EEVEE_EffectsInfo *effects, const dou
/* Get focus distance in NDC. */
float focus_pt[3] = {0.0f, 0.0f, -focus_distance};
mul_project_m4_v3(winmat, focus_pt);
- /* Get pixel footprint in viewspace. */
+ /* Get pixel footprint in view-space. */
float jitter_scaled[3] = {dof_jitter[0], dof_jitter[1], focus_pt[2]};
float center[3] = {0.0f, 0.0f, focus_pt[2]};
mul_project_m4_v3(wininv, jitter_scaled);
mul_project_m4_v3(wininv, center);
- /* FIXME(fclem) The offset is noticeably large and the culling might make object pop out
- * of the bluring radius. To fix this, use custom enlarged culling matrix. */
+ /* FIXME(fclem): The offset is noticeably large and the culling might make object pop out
+ * of the blurring radius. To fix this, use custom enlarged culling matrix. */
sub_v2_v2v2(jitter_scaled, jitter_scaled, center);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list