diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-28 11:41:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-28 11:41:10 +0300 |
| commit | 885260117d6a9080ce073a1fb402b7af060f8645 (patch) | |
| tree | 1769a4c180115a0fdda86d5554159c43691f461b /source/blender/windowmanager/wm_window.h | |
| parent | 6d21970aa06a31398ed4a78b1c596f30a0b9ee87 (diff) | |
| parent | e1909958d9ec48333a7bfd0d34aede66efc9b1ad (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_window.c
Diffstat (limited to 'source/blender/windowmanager/wm_window.h')
| -rw-r--r-- | source/blender/windowmanager/wm_window.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h index 5a45cf718ec..089e2994d3d 100644 --- a/source/blender/windowmanager/wm_window.h +++ b/source/blender/windowmanager/wm_window.h @@ -67,8 +67,6 @@ void wm_window_swap_buffers (wmWindow *win); void wm_window_set_swap_interval(wmWindow *win, int interval); bool wm_window_get_swap_interval(wmWindow *win, int *intervalOut); -float wm_window_pixelsize(wmWindow *win); - void wm_get_cursor_position (wmWindow *win, int *x, int *y); void wm_cursor_position_from_ghost (wmWindow *win, int *x, int *y); void wm_cursor_position_to_ghost (wmWindow *win, int *x, int *y); |