diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 10:04:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 10:04:17 +0400 |
| commit | dfdfa3d51b48a6bffd90779a1778dcf0e9a751e4 (patch) | |
| tree | f51a4ea8668ee41182a5d60942e96804004d3c7a /source/blender/editors/space_view3d/view3d_view.c | |
| parent | 42517463821d0d0bbebe7c45bf40c06f4d8e9261 (diff) | |
code cleanup: replace macros VECCOPY, VECADD, VECSUB, INPR - with BLI_math funcs.
added copy float/double funcs: copy_v3fl_v3db(), copy_v3db_v3fl(). 2d & 4d too.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 7a7a7e9920e..88658b30662 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -546,10 +546,10 @@ void ED_view3d_calc_clipping(BoundBox *bb, float planes[4][4], bglMats *mats, co ys= (val==0||val==1)?rect->ymin:rect->ymax; gluUnProject(xs, ys, 0.0, mats->modelview, mats->projection, mats->viewport, &p[0], &p[1], &p[2]); - VECCOPY(bb->vec[val], p); + copy_v3fl_v3db(bb->vec[val], p); gluUnProject(xs, ys, 1.0, mats->modelview, mats->projection, mats->viewport, &p[0], &p[1], &p[2]); - VECCOPY(bb->vec[4+val], p); + copy_v3fl_v3db(bb->vec[4 + val], p); } /* verify if we have negative scale. doing the transform before cross @@ -762,8 +762,9 @@ void view3d_unproject(bglMats *mats, float out[3], const short x, const short y, { double ux, uy, uz; - gluUnProject(x,y,z, mats->modelview, mats->projection, - (GLint *)mats->viewport, &ux, &uy, &uz ); + gluUnProject(x,y,z, mats->modelview, mats->projection, + (GLint *)mats->viewport, &ux, &uy, &uz); + out[0] = ux; out[1] = uy; out[2] = uz; |