diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2011-10-04 22:15:28 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2011-10-04 22:15:28 +0400 |
| commit | 43764c30d20674c9c647f75d1cc7bad5901f54e5 (patch) | |
| tree | 0c06723b0f3749f18030169b271eb42fdf1f286d /source | |
| parent | fdd0d7f9500176ea20a09ce753fb218e54615127 (diff) | |
bge bugfix: navmesh collision flag disputing with glsl_color_manag.
The solution is to make the flag in to an int in oppose to short.
This will also help in cucumber where we ran into the same problem.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f0f346fb759..b2ded4c756a 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -470,7 +470,8 @@ typedef struct GameData { * bit 3: (gameengine): Activity culling is enabled. * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling */ - short mode, flag, matmode, pad[2]; + int flag; + short mode, matmode, pad; short occlusionRes; /* resolution of occlusion Z buffer in pixel */ short physicsEngine; short ticrate, maxlogicstep, physubstep, maxphystep; @@ -520,9 +521,9 @@ typedef struct GameData { #define GAME_IGNORE_DEPRECATION_WARNINGS (1 << 12) #define GAME_ENABLE_ANIMATION_RECORD (1 << 13) #define GAME_SHOW_MOUSE (1 << 14) -#define GAME_SHOW_OBSTACLE_SIMULATION (1 << 15) #define GAME_GLSL_NO_COLOR_MANAGEMENT (1 << 15) -/* Note: GameData.flag is a short (max 16 flags). To add more flags, GameData.flag needs to be an int */ +#define GAME_SHOW_OBSTACLE_SIMULATION (1 << 16) +/* Note: GameData.flag is now an int (max 32 flags). A short could only take 16 flags */ /* GameData.matmode */ #define GAME_MAT_TEXFACE 0 |