Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-12-13 08:22:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-12-13 08:22:20 +0300
commit36c6b2e893b89f6b378f60fb975f73d47b248027 (patch)
treeaad54a27e5150753bbcaba72d6ed388e9d72cf4b /source/blender/blenlib
parent8ad2642c4717dcfad31626f7eebac325a9827b73 (diff)
Cleanup: spelling in comments
Also move notes about where noise functions come from into the function body as it's not relavant to the public doc-string.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_math_geom.h4
-rw-r--r--source/blender/blenlib/BLI_noise.hh8
-rw-r--r--source/blender/blenlib/intern/noise.cc8
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h
index 539bb338032..a4c3c43ebd3 100644
--- a/source/blender/blenlib/BLI_math_geom.h
+++ b/source/blender/blenlib/BLI_math_geom.h
@@ -333,8 +333,8 @@ double closest_to_line_v2_db(double r_close[2],
const double l1[2],
const double l2[2]);
/**
- * Find closest point to p on line through (l1, l2) and return lambda,
- * where (0 <= lambda <= 1) when cp is in the line segment (l1, l2).
+ * Find closest point to p on line through (`l1`, `l2`) and return lambda,
+ * where (0 <= lambda <= 1) when `p` is in the line segment (`l1`, `l2`).
*/
float closest_to_line_v3(float r_close[3], const float p[3], const float l1[3], const float l2[3]);
/**
diff --git a/source/blender/blenlib/BLI_noise.hh b/source/blender/blenlib/BLI_noise.hh
index ae80a98c45f..44af2c44f00 100644
--- a/source/blender/blenlib/BLI_noise.hh
+++ b/source/blender/blenlib/BLI_noise.hh
@@ -245,8 +245,6 @@ float musgrave_hybrid_multi_fractal(const float4 co,
* \param H: fractal increment parameter.
* \param lacunarity: gap between successive frequencies.
* \param octaves: number of frequencies in the fBm.
- *
- * \param from "Texturing and Modelling: A procedural approach".
*/
float musgrave_fBm(const float co, const float H, const float lacunarity, const float octaves);
@@ -256,8 +254,6 @@ float musgrave_fBm(const float co, const float H, const float lacunarity, const
* \param H: fractal increment parameter.
* \param lacunarity: gap between successive frequencies.
* \param octaves: number of frequencies in the fBm.
- *
- * \param from "Texturing and Modelling: A procedural approach".
*/
float musgrave_fBm(const float2 co, const float H, const float lacunarity, const float octaves);
/**
@@ -266,8 +262,6 @@ float musgrave_fBm(const float2 co, const float H, const float lacunarity, const
* \param H: fractal increment parameter.
* \param lacunarity: gap between successive frequencies.
* \param octaves: number of frequencies in the fBm.
- *
- * \param from "Texturing and Modelling: A procedural approach".
*/
float musgrave_fBm(const float3 co, const float H, const float lacunarity, const float octaves);
/**
@@ -276,8 +270,6 @@ float musgrave_fBm(const float3 co, const float H, const float lacunarity, const
* \param H: fractal increment parameter.
* \param lacunarity: gap between successive frequencies.
* \param octaves: number of frequencies in the fBm.
- *
- * \param from "Texturing and Modelling: A procedural approach".
*/
float musgrave_fBm(const float4 co, const float H, const float lacunarity, const float octaves);
diff --git a/source/blender/blenlib/intern/noise.cc b/source/blender/blenlib/intern/noise.cc
index 56ff4feb42e..a6ad18801fd 100644
--- a/source/blender/blenlib/intern/noise.cc
+++ b/source/blender/blenlib/intern/noise.cc
@@ -768,6 +768,8 @@ float musgrave_fBm(const float co,
const float lacunarity,
const float octaves_unclamped)
{
+ /* From "Texturing and Modelling: A procedural approach". */
+
float p = co;
float value = 0.0f;
float pwr = 1.0f;
@@ -917,6 +919,8 @@ float musgrave_fBm(const float2 co,
const float lacunarity,
const float octaves_unclamped)
{
+ /* From "Texturing and Modelling: A procedural approach". */
+
float2 p = co;
float value = 0.0f;
float pwr = 1.0f;
@@ -1067,6 +1071,8 @@ float musgrave_fBm(const float3 co,
const float lacunarity,
const float octaves_unclamped)
{
+ /* From "Texturing and Modelling: A procedural approach". */
+
float3 p = co;
float value = 0.0f;
float pwr = 1.0f;
@@ -1219,6 +1225,8 @@ float musgrave_fBm(const float4 co,
const float lacunarity,
const float octaves_unclamped)
{
+ /* From "Texturing and Modelling: A procedural approach". */
+
float4 p = co;
float value = 0.0f;
float pwr = 1.0f;