diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-07-06 22:25:57 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-07-06 22:25:57 +0300 |
| commit | 83c37d722dbaaf418a6ca1479e1dc0253d8a12b2 (patch) | |
| tree | e827321f5defee299127ec143db345198b0205c6 /source/blender/makesdna/DNA_scene_types.h | |
| parent | c5301948c0e1e60ddd8dc76539f7ae188a9415ab (diff) | |
| parent | 04b3d682bbfaba08d66efef326a55bf4a00d1e3c (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 073b4053aa0..19103880c21 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -932,6 +932,7 @@ typedef struct GameData { #define GAME_GLSL_NO_COLOR_MANAGEMENT (1 << 15) #define GAME_SHOW_OBSTACLE_SIMULATION (1 << 16) #define GAME_NO_MATERIAL_CACHING (1 << 17) +#define GAME_GLSL_NO_ENV_LIGHTING (1 << 18) /* Note: GameData.flag is now an int (max 32 flags). A short could only take 16 flags */ /* GameData.playerflag */ |