diff options
| author | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
|---|---|---|
| committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
| commit | a68a7f42b02ad0260220d94f36ab61c772db071a (patch) | |
| tree | 620b763cd24fbfc1259f00ccb005217914af0c6f /source/blender/include/BSE_view.h | |
| parent | 526d0bec4722900a86d81ff0f5d71504b2b4ad8c (diff) | |
| parent | 15215493bf9d1d08e650109e6eb6189fc76e289e (diff) | |
resolved conflict state with HEAD r14096
blenderbuttons still bad
not let this compile
Diffstat (limited to 'source/blender/include/BSE_view.h')
| -rw-r--r-- | source/blender/include/BSE_view.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/include/BSE_view.h b/source/blender/include/BSE_view.h index 94834d2c771..0e88b2467f7 100644 --- a/source/blender/include/BSE_view.h +++ b/source/blender/include/BSE_view.h @@ -78,6 +78,7 @@ void calctrackballvec(struct rcti *area, short *mval, float *vec); void viewmove(int mode); void viewmoveNDOFfly(int mode); void viewmoveNDOF(int mode); +void view_zoom_mouseloc(float dfac, short *mouseloc); int get_view3d_viewplane(int winxi, int winyi, rctf *viewplane, float *clipsta, float *clipend, float *pixsize); void setwinmatrixview3d(int winx, int winy, struct rctf *rect); |