diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-22 13:56:02 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-22 13:58:29 +0300 |
commit | 0b9cd0c88d43b637a652154c945494d36f0ad996 (patch) | |
tree | 925c32087b7d493e2eda612bca0caf2040c17bf3 /source/blender/editors/include | |
parent | 88158e4116a0108e68b59ffc5987104fa857a130 (diff) | |
parent | a5f046f44931a61272a065334438af86ddf9915c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_view3d.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 343bffa0082..bc131b45d37 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -99,10 +99,10 @@ typedef struct ViewDepths { } ViewDepths; struct View3DCursor *ED_view3d_cursor3d_get(struct Scene *scene, struct View3D *v3d); -void ED_view3d_cursor3d_calc_mat3(const struct Scene *scene, const struct View3D *v3d, float mat[3][3]); -void ED_view3d_cursor3d_calc_mat4(const struct Scene *scene, const struct View3D *v3d, float mat[4][4]); -void ED_view3d_cursor3d_position(struct bContext *C, float fp[3], const int mval[2]); -void ED_view3d_cursor3d_update(struct bContext *C, const int mval[2]); +void ED_view3d_cursor3d_calc_mat3(const struct Scene *scene, const struct View3D *v3d, float mat[3][3]); +void ED_view3d_cursor3d_calc_mat4(const struct Scene *scene, const struct View3D *v3d, float mat[4][4]); +void ED_view3d_cursor3d_position(struct bContext *C, const int mval[2], float cursor_co[3]); +void ED_view3d_cursor3d_update(struct bContext *C, const int mval[2]); struct Camera *ED_view3d_camera_data_get(struct View3D *v3d, struct RegionView3D *rv3d); |