diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-27 01:39:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-27 01:39:16 +0400 |
| commit | f63e33303f3523420e6e20cd024dfe2cc649edca (patch) | |
| tree | b77b6b2cc393478c2d72079fd40879c4ac3a6e82 /source/blender/editors/space_view3d/view3d_view.c | |
| parent | 2cd5436a81da5c15ac70bd2b80c2f062cce5d02e (diff) | |
| parent | 8cc96408df7f3848ce7b7d3598c0caeb327e4f8c (diff) | |
svn merge ^/trunk/blender -r42871:42882
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 56f4874fe30..c9639376d1d 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -512,7 +512,7 @@ void VIEW3D_OT_object_as_camera(wmOperatorType *ot) /* ********************************** */ -void ED_view3d_calc_clipping(BoundBox *bb, float planes[4][4], bglMats *mats, rcti *rect) +void ED_view3d_calc_clipping(BoundBox *bb, float planes[4][4], bglMats *mats, const rcti *rect) { float modelview[4][4]; double xs, ys, p[3]; @@ -758,7 +758,7 @@ void view3d_unproject(bglMats *mats, float out[3], const short x, const short y, } /* use view3d_get_object_project_mat to get projecting mat */ -void ED_view3d_project_float(ARegion *ar, const float vec[3], float adr[2], float mat[4][4]) +void ED_view3d_project_float(const ARegion *ar, const float vec[3], float adr[2], float mat[4][4]) { float vec4[4]; |