From d8b80896305d9a5379a29be6001c64c01823d6ba Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 19 Sep 2023 15:53:51 +1000 Subject: [PATCH] Cleanup: spelling & typo in last commit --- intern/cycles/kernel/integrator/guiding.h | 2 +- source/blender/draw/engines/eevee/eevee_materials.cc | 3 ++- .../draw/engines/eevee_next/shaders/eevee_lut_comp.glsl | 2 +- source/blender/windowmanager/intern/wm_init_exit.cc | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/intern/cycles/kernel/integrator/guiding.h b/intern/cycles/kernel/integrator/guiding.h index f2d1c343a83..0d04963558a 100644 --- a/intern/cycles/kernel/integrator/guiding.h +++ b/intern/cycles/kernel/integrator/guiding.h @@ -15,7 +15,7 @@ CCL_NAMESPACE_BEGIN struct GuidingRISSample { float3 rand; float2 sampled_roughness; - /* The relative ior of the outgoing media and the incoming media. */ + /* The relative IOR of the outgoing media and the incoming media. */ float eta{1.0f}; int label; float3 wo; diff --git a/source/blender/draw/engines/eevee/eevee_materials.cc b/source/blender/draw/engines/eevee/eevee_materials.cc index fa64b4310b5..e18fdf23f8b 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.cc +++ b/source/blender/draw/engines/eevee/eevee_materials.cc @@ -196,7 +196,8 @@ static void eevee_init_util_texture() texels_layer[y * 64 + x][0] = blender::eevee::lut::bsdf_ggx[j][y][x][0]; texels_layer[y * 64 + x][1] = blender::eevee::lut::bsdf_ggx[j][y][x][1]; texels_layer[y * 64 + x][2] = blender::eevee::lut::bsdf_ggx[j][y][x][2]; - /* BTDF LUT for `IOR > 1`, parametrized differently as above. See `eevee_lut_comp.glsl`. */ + /* BTDF LUT for `IOR > 1`, parameterized differently as above. + * See `eevee_lut_comp.glsl`. */ texels_layer[y * 64 + x][3] = blender::eevee::lut::btdf_ggx[j][y][x][0]; } } diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_lut_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_lut_comp.glsl index 1998ba58abc..d2757702978 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_lut_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_lut_comp.glsl @@ -125,7 +125,7 @@ vec4 ggx_bsdf_split_sum(vec3 lut_coord) /* Generate BTDF LUT for `IOR > 1` using Schlick's approximation. Only the transmittance is needed * because the scale and bias does not depend on the IOR and can be obtained from the BRDF LUT. * - * Parametrize with `x = sqrt((ior - 1) / (ior + 1))` for higher precision in 1 < IOR < 2, + * Parameterize with `x = sqrt((ior - 1) / (ior + 1))` for higher precision in 1 < IOR < 2, * and `y = sqrt(1.0 - cos(theta))`, `z = roughness` similar to BRDF LUT. * * The result is interpreted as: diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index b6e736c2a47..aa2f2beb301 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -663,7 +663,7 @@ void WM_exit_ex(bContext *C, const bool do_python_exit, const bool do_user_exit_ // free_txt_data(); #ifdef WITH_PYTHON - /* Option not to exit Python so this function can called from 'atexit'. */ + /* Option not to exit Python so this function can be called from 'atexit'. */ if ((C == nullptr) || CTX_py_init_get(C)) { /* NOTE: (old note) * before BKE_blender_free so Python's garbage-collection happens while library still exists. @@ -675,7 +675,7 @@ void WM_exit_ex(bContext *C, const bool do_python_exit, const bool do_user_exit_ BPY_python_end(do_python_exit); } #else - (void)do_python; + (void)do_python_exit; #endif ED_file_exit(); /* For file-selector menu data. */