diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/freestyle/intern/geometry/GeomUtils.h | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/freestyle/intern/geometry/GeomUtils.h')
| -rw-r--r-- | source/blender/freestyle/intern/geometry/GeomUtils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h index 8f3abf451c9..9e7c629191f 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.h +++ b/source/blender/freestyle/intern/geometry/GeomUtils.h @@ -174,7 +174,7 @@ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][ */ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real transform[4][4], const int viewport[4]); -/*! Projects from world coordinates to camera coordinates +/*! Projects from world coordinates to camera coordinates * Returns the point's coordinates expressed in the camera's * coordinates system. * p @@ -220,7 +220,7 @@ void fromRetinaToImage(const Vec3r& p, Vec3r& q, const int viewport[4]); */ void fromImageToRetina(const Vec3r& p, Vec3r& q, const int viewport[4]); -/*! computes the coordinates of q in the camera coordinates system, +/*! computes the coordinates of q in the camera coordinates system, * using the known z coordinates of the 3D point. * That means that this method does not inverse any matrices, * it only computes X and Y from x,y and Z) |