archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v2.92-release'

Browse Source
This commit is contained in:
Campbell Barton
2021-02-11 08:40:16 +11:00
parent 1a52b5f7d3 4719836eca
commit 16c621e529
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/BLI_math_vector.h
View File

@@ -309,6 +309,7 @@ void interp_v4_v4v4_uchar(unsigned char target[4],
void mid_v3_v3v3(float r[3], const float a[3], const float b[3]);
void mid_v2_v2v2(float r[2], const float a[2], const float b[2]);
void mid_v3_v3v3v3(float v[3], const float v1[3], const float v2[3], const float v3[3]);
void mid_v2_v2v2v2(float v[2], const float v1[2], const float v2[2], const float v3[2]);
void mid_v3_v3v3v3v3(
float v[3], const float v1[3], const float v2[3], const float v3[3], const float v4[3]);
void mid_v3_v3_array(float r[3], const float (*vec_arr)[3], const unsigned int nbr);

6
source/blender/blenlib/intern/math_vector.c
View File

@@ -280,6 +280,12 @@ void mid_v2_v2v2(float r[2], const float a[2], const float b[2])
r[1] = 0.5f * (a[1] + b[1]);
}
void mid_v2_v2v2v2(float v[2], const float v1[2], const float v2[2], const float v3[2])
{
v[0] = (v1[0] + v2[0] + v3[0]) / 3.0f;
v[1] = (v1[1] + v2[1] + v3[1]) / 3.0f;
}
void mid_v3_v3v3v3(float v[3], const float v1[3], const float v2[3], const float v3[3])
{
v[0] = (v1[0] + v2[0] + v3[0]) / 3.0f;