Merged revision(s) 58682-58770 from trunk/blender into soc-2013-dingto.
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index c9aa19ccc67531b4f05c1c64be6db884c964ec15..5f1fc078adef1893577201275f8ed8f240c32ce6 100644 (file)
@@ -655,7 +655,8 @@ typedef struct GameData {
        short mode, matmode;
        short occlusionRes;             /* resolution of occlusion Z buffer in pixel */
        short physicsEngine;
-       short exitkey, pad;
+       short exitkey;
+       short vsync; /* Controls vsync: off, on, or adaptive (if supported) */
        short ticrate, maxlogicstep, physubstep, maxphystep;
        short obstacleSimulation;
        short raster_storage;
@@ -691,6 +692,11 @@ typedef struct GameData {
 #define RAS_STORE_VA           2
 #define RAS_STORE_VBO          3
 
+/* vsync */
+#define VSYNC_OFF      0
+#define VSYNC_ON       1
+#define VSYNC_ADAPTIVE 2
+
 /* GameData.flag */
 #define GAME_RESTRICT_ANIM_UPDATES                     (1 << 0)
 #define GAME_ENABLE_ALL_FRAMES                         (1 << 1)