diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-20 05:46:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-20 05:51:16 +0300 |
| commit | 9dac8633d6dd7616cfd1beca6079156e95b0f15b (patch) | |
| tree | d2bac0731c919d839b56abad1d7183732c3bae29 /source/blender/editors/include/ED_view3d.h | |
| parent | 66720194840b11bdfb0f26e4191d1f214cdc2e8e (diff) | |
| parent | 1cc9022eb51b73abc84d79366a9cf54a561c7520 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_view3d.h')
| -rw-r--r-- | source/blender/editors/include/ED_view3d.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 8e9c1736122..30daaad3c2c 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -274,11 +274,11 @@ void ED_view3d_win_to_3d_int( float r_out[3]); bool ED_view3d_win_to_3d_on_plane( const struct ARegion *ar, - const float plane[4], const float mval[2], + const float plane[4], const float mval[2], const bool do_clip, float r_out[3]); bool ED_view3d_win_to_3d_on_plane_int( const struct ARegion *ar, - const float plane[4], const int mval[2], + const float plane[4], const int mval[2], const bool do_clip, float r_out[3]); void ED_view3d_win_to_delta(const struct ARegion *ar, const float mval[2], float out[3], const float zfac); void ED_view3d_win_to_origin(const struct ARegion *ar, const float mval[2], float out[3]); |