diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:36:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:36:30 +0300 |
| commit | 61d27db35967710421ab92748e09624db068258d (patch) | |
| tree | bc0a53ad97072a3bacb9cf5265abb19d0b511ecd /source/blender/blenlib/BLI_math_geom.h | |
| parent | 56173e512cab020a5bc96e6d3069641a03d47fbe (diff) | |
| parent | 5513da65b24a3ce77b1709acea841475115f3a7a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/BLI_math_geom.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index f12ee2b3c69..630a508727c 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -422,7 +422,7 @@ void interp_barycentric_tri_v3(float data[3][3], float u, float v, float res[3]) /***************************** View & Projection *****************************/ -void lookat_m4(float mat[4][4], float vx, float vy, +void lookat_m4(float mat[4][4], float vx, float vy, float vz, float px, float py, float pz, float twist); void polarview_m4(float mat[4][4], float dist, float azimuth, float incidence, float twist); |