diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:17:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:22:54 +0400 |
| commit | 54ee22130ca0ce59500c6eddb562b78eb4526bcd (patch) | |
| tree | ba21cdaa35656c590059c864e028e24b6e234082 /source/gameengine/GamePlayer/ghost/GPG_Canvas.h | |
| parent | b09f7dcaa7b487ada53c8dbaa811deaa1201d163 (diff) | |
| parent | 04814476c08e9350c424619cd99ccb1149d65365 (diff) | |
Merge branch 'master' into dyntopo_holesdyntopo_holes
Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c
Diffstat (limited to 'source/gameengine/GamePlayer/ghost/GPG_Canvas.h')
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Canvas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h index 6e1f86cac0e..337c2cedf55 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h +++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h @@ -56,7 +56,7 @@ public: virtual void SetMouseState(RAS_MouseState mousestate); virtual void SwapBuffers(); virtual void SetSwapInterval(int interval); - virtual int GetSwapInterval(); + virtual bool GetSwapInterval(int& intervalOut); virtual int GetMouseX(int x) { return x; } virtual int GetMouseY(int y) { return y; } |