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:
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r--source/blender/blenlib/intern/boxpack_2d.c4
-rw-r--r--source/blender/blenlib/intern/math_base_inline.c2
-rw-r--r--source/blender/blenlib/intern/math_color.c2
-rw-r--r--source/blender/blenlib/intern/math_geom.c24
-rw-r--r--source/blender/blenlib/intern/math_matrix.c12
-rw-r--r--source/blender/blenlib/intern/winstuff.c2
6 files changed, 23 insertions, 23 deletions
diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c
index 58889827b96..ea6c2d8d498 100644
--- a/source/blender/blenlib/intern/boxpack_2d.c
+++ b/source/blender/blenlib/intern/boxpack_2d.c
@@ -298,8 +298,8 @@ void BLI_box_pack_2d(BoxPack *boxarray, const uint len, float *r_tot_x, float *r
bool isect;
float tot_x = 0.0f, tot_y = 0.0f;
- BoxPack *box, *box_test; /*current box and another for intersection tests*/
- BoxVert *vert; /* the current vert */
+ BoxPack *box, *box_test; /* Current box and another for intersection tests. */
+ BoxVert *vert; /* The current vert. */
struct VertSortContext vs_ctx;
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c
index 5114d548b9c..58b109eca10 100644
--- a/source/blender/blenlib/intern/math_base_inline.c
+++ b/source/blender/blenlib/intern/math_base_inline.c
@@ -199,7 +199,7 @@ MINLINE float scalenorm(float a, float b, float x)
return (x * (b - a)) + a;
}
-/* used for zoom values*/
+/* Used for zoom values. */
MINLINE float power_of_2(float val)
{
return (float)pow(2.0, ceil(log((double)val) / M_LN2));
diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c
index abcb3139dc7..67c4ad95d79 100644
--- a/source/blender/blenlib/intern/math_color.c
+++ b/source/blender/blenlib/intern/math_color.c
@@ -478,7 +478,7 @@ void minmax_rgb(short c[3])
* accessible from the given triple of primaries. Desaturate
* it by adding white, equal quantities of R, G, and B, enough
* to make RGB all positive. The function returns 1 if the
- * components were modified, zero otherwise.*/
+ * components were modified, zero otherwise. */
int constrain_rgb(float *r, float *g, float *b)
{
/* Amount of white needed */
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 272623ab4ec..3175bf116a0 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -856,7 +856,7 @@ void dist_squared_to_projected_aabb_precalc(struct DistProjectedAABBPrecalc *pre
}
#else
if (!isect_plane_plane_v3(px, py, precalc->ray_origin, precalc->ray_direction)) {
- /* Matrix with weird coplanar planes. Undetermined origin.*/
+ /* Matrix with weird co-planar planes. Undetermined origin. */
zero_v3(precalc->ray_origin);
precalc->ray_direction[0] = precalc->pmat[0][3];
precalc->ray_direction[1] = precalc->pmat[1][3];
@@ -2133,7 +2133,7 @@ bool isect_ray_line_v3(const float ray_origin[3],
const float nlen = len_squared_v3(n);
if (nlen == 0.0f) {
- /* the lines are parallel.*/
+ /* The lines are parallel. */
return false;
}
@@ -2903,7 +2903,7 @@ bool isect_sweeping_sphere_tri_v3(const float p1[3],
/*---test edges---*/
sub_v3_v3v3(e3, v2, v1); /* wasn't yet calculated */
- /*e1*/
+ /* `e1` */
sub_v3_v3v3(bv, v0, p1);
elen2 = dot_v3v3(e1, e1);
@@ -2926,8 +2926,8 @@ bool isect_sweeping_sphere_tri_v3(const float p1[3],
}
}
- /*e2*/
- /*bv is same*/
+ /* `e2` */
+ /* `bv` is same. */
elen2 = dot_v3v3(e2, e2);
edotv = dot_v3v3(e2, vel);
edotbv = dot_v3v3(e2, bv);
@@ -2948,11 +2948,11 @@ bool isect_sweeping_sphere_tri_v3(const float p1[3],
}
}
- /*e3*/
- /* sub_v3_v3v3(bv, v0, p1); */ /* UNUSED */
- /* elen2 = dot_v3v3(e1, e1); */ /* UNUSED */
- /* edotv = dot_v3v3(e1, vel); */ /* UNUSED */
- /* edotbv = dot_v3v3(e1, bv); */ /* UNUSED */
+ /* `e3` */
+ // sub_v3_v3v3(bv, v0, p1); /* UNUSED */
+ // elen2 = dot_v3v3(e1, e1); /* UNUSED */
+ // edotv = dot_v3v3(e1, vel); /* UNUSED */
+ // edotbv = dot_v3v3(e1, bv); /* UNUSED */
sub_v3_v3v3(bv, v1, p1);
elen2 = dot_v3v3(e3, e3);
@@ -4642,7 +4642,7 @@ void resolve_quad_uv_v2_deriv(float r_uv[2],
(st3[0] * st0[1] - st3[1] * st0[0]);
/* X is 2D cross product (determinant)
- * A = (p0 - p) X (p0 - p3)*/
+ * A = (p0 - p) X (p0 - p3) */
const double a = (st0[0] - st[0]) * (st0[1] - st3[1]) - (st0[1] - st[1]) * (st0[0] - st3[0]);
/* B = ( (p0 - p) X (p1 - p2) + (p1 - p) X (p0 - p3) ) / 2 */
@@ -4731,7 +4731,7 @@ float resolve_quad_u_v2(const float st[2],
(st3[0] * st0[1] - st3[1] * st0[0]);
/* X is 2D cross product (determinant)
- * A = (p0 - p) X (p0 - p3)*/
+ * A = (p0 - p) X (p0 - p3) */
const double a = (st0[0] - st[0]) * (st0[1] - st3[1]) - (st0[1] - st[1]) * (st0[0] - st3[0]);
/* B = ( (p0 - p) X (p1 - p2) + (p1 - p) X (p0 - p3) ) / 2 */
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index d447da4de64..5eb0125062d 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -2665,7 +2665,7 @@ void loc_eul_size_to_mat4(float R[4][4],
size_to_mat3(smat, size);
mul_m3_m3m3(tmat, rmat, smat);
- /* copy rot/scale part to output matrix*/
+ /* Copy rot/scale part to output matrix. */
copy_m4_m3(R, tmat);
/* copy location to matrix */
@@ -2686,18 +2686,18 @@ void loc_eulO_size_to_mat4(float R[4][4],
{
float rmat[3][3], smat[3][3], tmat[3][3];
- /* initialize new matrix */
+ /* Initialize new matrix. */
unit_m4(R);
- /* make rotation + scaling part */
+ /* Make rotation + scaling part. */
eulO_to_mat3(rmat, eul, rotOrder);
size_to_mat3(smat, size);
mul_m3_m3m3(tmat, rmat, smat);
- /* copy rot/scale part to output matrix*/
+ /* Copy rot/scale part to output matrix. */
copy_m4_m3(R, tmat);
- /* copy location to matrix */
+ /* Copy location to matrix. */
R[3][0] = loc[0];
R[3][1] = loc[1];
R[3][2] = loc[2];
@@ -2722,7 +2722,7 @@ void loc_quat_size_to_mat4(float R[4][4],
size_to_mat3(smat, size);
mul_m3_m3m3(tmat, rmat, smat);
- /* copy rot/scale part to output matrix*/
+ /* Copy rot/scale part to output matrix. */
copy_m4_m3(R, tmat);
/* copy location to matrix */
diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c
index d40f665ba0d..beeae175869 100644
--- a/source/blender/blenlib/intern/winstuff.c
+++ b/source/blender/blenlib/intern/winstuff.c
@@ -45,7 +45,7 @@ int BLI_windows_get_executable_dir(char *str)
{
char dir[FILE_MAXDIR];
int a;
- /*change to utf support*/
+ /* Change to utf support. */
GetModuleFileName(NULL, str, FILE_MAX);
BLI_split_dir_part(str, dir, sizeof(dir)); /* shouldn't be relative */
a = strlen(dir);