diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-06 15:00:46 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-06 15:00:46 +0300 |
| commit | a5cba9aab9a2ade00caefc1a7697f8fbd3f7304f (patch) | |
| tree | b34138ac968663a47cdd2b09a26ea68aeeba2377 /source/blender/windowmanager/wm.h | |
| parent | dc9a7f861fa43fecae7450ee254a711b061c0c26 (diff) | |
| parent | b498db06eb43f1e036f16cb346bf4cbb6d20e6d5 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_view3d/view3d_draw.c
Diffstat (limited to 'source/blender/windowmanager/wm.h')
| -rw-r--r-- | source/blender/windowmanager/wm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h index 3dd294128e2..f63246580ea 100644 --- a/source/blender/windowmanager/wm.h +++ b/source/blender/windowmanager/wm.h @@ -80,6 +80,7 @@ void wm_autosave_location(char *filepath); /* wm_stereo.c */ void wm_method_draw_stereo3d(const bContext *C, wmWindow *win); +void wm_stereo3d_mouse_offset_apply(wmWindow *win, int *r_mouse_xy); int wm_stereo3d_set_exec(bContext *C, wmOperator *op); int wm_stereo3d_set_invoke(bContext *C, wmOperator *op, const wmEvent *event); void wm_stereo3d_set_draw(bContext *C, wmOperator *op); |