diff options
| -rw-r--r-- | source/blender/blenlib/intern/noise.c | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 14 | ||||
| -rw-r--r-- | source/blender/python/mathutils/mathutils_noise.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index 859bb66073c..bd83c5e018c 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -1130,7 +1130,7 @@ static float turbulencep(float noisesize, float x, float y, float z, int nr) /* VORONOI/WORLEY */ /******************/ -/* distance metrics for voronoi, e parameter only used in Minkovsky */ +/* distance metrics for voronoi, e parameter only used in Minkowski */ /* Camberra omitted, didn't seem useful */ /* distance squared */ @@ -1161,7 +1161,7 @@ static float dist_Chebychev(float x, float y, float z, float e) return ((z > t) ? z : t); } -/* minkovsky preset exponent 0.5 */ +/* minkowski preset exponent 0.5 */ static float dist_MinkovskyH(float x, float y, float z, float e) { float d = sqrtf(fabsf(x)) + sqrtf(fabsf(y)) + sqrtf(fabsf(z)); @@ -1169,7 +1169,7 @@ static float dist_MinkovskyH(float x, float y, float z, float e) return (d * d); } -/* minkovsky preset exponent 4 */ +/* minkowski preset exponent 4 */ static float dist_Minkovsky4(float x, float y, float z, float e) { (void)e; @@ -1179,7 +1179,7 @@ static float dist_Minkovsky4(float x, float y, float z, float e) return sqrtf(sqrtf(x * x + y * y + z * z)); } -/* Minkovsky, general case, slow, maybe too slow to be useful */ +/* Minkowski, general case, slow, maybe too slow to be useful */ static float dist_Minkovsky(float x, float y, float z, float e) { return powf(powf(fabsf(x), e) + powf(fabsf(y), e) + powf(fabsf(z), e), 1.0f / e); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 0270a7643a6..483e3ab7f8a 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -1443,12 +1443,12 @@ static void rna_def_texture_voronoi(BlenderRNA *brna) "The length of the distance in axial directions"}, {TEX_CHEBYCHEV, "CHEBYCHEV", 0, "Chebychev", "The length of the longest Axial journey"}, - {TEX_MINKOVSKY_HALF, "MINKOVSKY_HALF", 0, "Minkovsky 1/2", - "Set Minkovsky variable to 0.5"}, - {TEX_MINKOVSKY_FOUR, "MINKOVSKY_FOUR", 0, "Minkovsky 4", - "Set Minkovsky variable to 4"}, - {TEX_MINKOVSKY, "MINKOVSKY", 0, "Minkovsky", - "Use the Minkowsky function to calculate distance " + {TEX_MINKOVSKY_HALF, "MINKOVSKY_HALF", 0, "Minkowski 1/2", + "Set Minkowski variable to 0.5"}, + {TEX_MINKOVSKY_FOUR, "MINKOVSKY_FOUR", 0, "Minkowski 4", + "Set Minkowski variable to 4"}, + {TEX_MINKOVSKY, "MINKOVSKY", 0, "Minkowski", + "Use the Minkowski function to calculate distance " "(exponent value determines the shape of the boundaries)"}, {0, NULL, 0, NULL, NULL} }; @@ -1494,7 +1494,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna) prop = RNA_def_property(srna, "minkovsky_exponent", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "vn_mexp"); RNA_def_property_range(prop, 0.01, 10); - RNA_def_property_ui_text(prop, "Minkovsky Exponent", "Minkovsky exponent"); + RNA_def_property_ui_text(prop, "Minkowski Exponent", "Minkowski exponent"); RNA_def_property_update(prop, 0, "rna_Texture_update"); prop = RNA_def_property(srna, "distance_metric", PROP_ENUM, PROP_NONE); diff --git a/source/blender/python/mathutils/mathutils_noise.c b/source/blender/python/mathutils/mathutils_noise.c index 9460c4d0b36..da32e36dc02 100644 --- a/source/blender/python/mathutils/mathutils_noise.c +++ b/source/blender/python/mathutils/mathutils_noise.c @@ -717,7 +717,7 @@ PyDoc_STRVAR(M_Noise_voronoi_doc, " :type position: :class:`mathutils.Vector`\n" " :arg distance_metric: Method of measuring distance.\n" " :type distance_metric: Value in noise.distance_metrics or int\n" -" :arg exponent: The exponent for Minkovsky distance metric.\n" +" :arg exponent: The exponent for Minkowski distance metric.\n" " :type exponent: float\n" " :return: A list of distances to the four closest features and their locations.\n" " :rtype: list of four floats, list of four :class:`mathutils.Vector` types\n" @@ -729,7 +729,7 @@ static PyObject *M_Noise_voronoi(PyObject *UNUSED(self), PyObject *args) float vec[3]; float da[4], pa[12]; int dtype = 0; - float me = 2.5f; /* default minkovsky exponent */ + float me = 2.5f; /* default minkowski exponent */ int i; |