Merging r58701 through r58746 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index ac38578b981b8e1b9907d9c661860352405385e2..035238299f85a0315703bbd5d69290e2f7ab9571 100644 (file)
@@ -653,7 +653,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;
@@ -689,6 +690,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)